diff options
author | NikolaMandic <mn080202@gmail.com> | 2014-06-18 19:23:39 +0200 |
---|---|---|
committer | NikolaMandic <mn080202@gmail.com> | 2014-06-18 19:25:51 +0200 |
commit | 962e1186f9a0a43344e19dcf70bac159f0eafb4e (patch) | |
tree | aba6e4505a5b7217c867a71ac1c89fd1180d660b /contrib/mkimage-arch.sh | |
parent | c4327f714614b399b2f39c95e31458747b4c0127 (diff) | |
download | docker-962e1186f9a0a43344e19dcf70bac159f0eafb4e.tar.gz |
removed expect from mkimage-arch since it was not working
Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com> (github: NikolaMandic)
Diffstat (limited to 'contrib/mkimage-arch.sh')
-rwxr-xr-x | contrib/mkimage-arch.sh | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh index dc21067473..0a77a11796 100755 --- a/contrib/mkimage-arch.sh +++ b/contrib/mkimage-arch.sh @@ -9,31 +9,13 @@ hash pacstrap &>/dev/null || { exit 1 } -hash expect &>/dev/null || { - echo "Could not find expect. Run pacman -S expect" - exit 1 -} - ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX) chmod 755 $ROOTFS # packages to ignore for space savings PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs -expect <<EOF - set timeout 60 - set send_slow {1 1} - spawn pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE - expect { - "Install anyway?" { send n\r; exp_continue } - "(default=all)" { send \r; exp_continue } - "Proceed with installation?" { send "\r"; exp_continue } - "skip the above package" {send "y\r"; exp_continue } - "checking" { exp_continue } - "loading" { exp_continue } - "installing" { exp_continue } - } -EOF +pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate archlinux" arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime" |