Browse code

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)

Tianon Gravi authored on 2014/07/01 06:52:04
Showing 1 changed files
... ...
@@ -9,31 +9,13 @@ hash pacstrap &>/dev/null || {
9 9
     exit 1
10 10
 }
11 11
 
12
-hash expect &>/dev/null || {
13
-    echo "Could not find expect. Run pacman -S expect"
14
-    exit 1
15
-}
16
-
17 12
 ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-archlinux-XXXXXXXXXX)
18 13
 chmod 755 $ROOTFS
19 14
 
20 15
 # packages to ignore for space savings
21 16
 PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs
22 17
 
23
-expect <<EOF
24
-  set timeout 60
25
-  set send_slow {1 1}
26
-  spawn pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE
27
-  expect {
28
-    "Install anyway?" { send n\r; exp_continue }
29
-    "(default=all)" { send \r; exp_continue }
30
-    "Proceed with installation?" { send "\r"; exp_continue }
31
-    "skip the above package" {send "y\r"; exp_continue }
32
-    "checking" { exp_continue }
33
-    "loading" { exp_continue }
34
-    "installing" { exp_continue }
35
-  }
36
-EOF
18
+pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE
37 19
 
38 20
 arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate archlinux"
39 21
 arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"