diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2014-01-06 13:13:19 +0100 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2014-01-21 14:22:39 +0100 |
| commit | da4ba80733ff4826ea17d253677a58fdedf4cc00 (patch) | |
| tree | 556c0c4806e50a9455886412035fd48248e81175 /contrib/mkimage-arch.sh | |
| parent | c6535d272c0d1a07ea51639be66e1959a0fc996f (diff) | |
| download | docker-da4ba80733ff4826ea17d253677a58fdedf4cc00.tar.gz | |
mkimage-arch: don't generate ISO-8859-1 locale
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Diffstat (limited to 'contrib/mkimage-arch.sh')
| -rwxr-xr-x | contrib/mkimage-arch.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh index 5f48557f78..41070aedb1 100755 --- a/contrib/mkimage-arch.sh +++ b/contrib/mkimage-arch.sh @@ -20,7 +20,7 @@ ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX) # 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} @@ -38,10 +38,7 @@ EOF 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" -cat > $ROOTFS/etc/locale.gen <<DELIM -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -DELIM +echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen arch-chroot $ROOTFS locale-gen arch-chroot $ROOTFS /bin/sh -c 'echo "Server = http://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist' |