diff options
author | Tianon Gravi <admwiggin@gmail.com> | 2014-06-30 15:52:04 -0600 |
---|---|---|
committer | Tianon Gravi <admwiggin@gmail.com> | 2014-06-30 15:52:04 -0600 |
commit | 75b3b382ca182bf9386bc03726b4edfa41f044e8 (patch) | |
tree | d10b6564dfefb1d73be1b163ec7af09e65376154 /contrib/mkimage-arch.sh | |
parent | 36c78c917240312e5521eccb195ccce31b29d0f8 (diff) | |
parent | 962e1186f9a0a43344e19dcf70bac159f0eafb4e (diff) | |
download | docker-75b3b382ca182bf9386bc03726b4edfa41f044e8.tar.gz |
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
* 'master' of https://github.com/NikolaMandic/docker:
removed expect from mkimage-arch since it was not working
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
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 27c6ac6a3e..1f52cbc1a1 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 ${TMPDIR:-/var/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" |