diff options
Diffstat (limited to 'mkimage-arch.sh')
| -rwxr-xr-x | mkimage-arch.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkimage-arch.sh b/mkimage-arch.sh index ecec8d6..be1d9ca 100755 --- a/mkimage-arch.sh +++ b/mkimage-arch.sh @@ -23,8 +23,6 @@ chmod 755 $ROOTFS # packages to ignore for space savings PKGIGNORE=( - cryptsetup - device-mapper dhcpcd iproute2 jfsutils @@ -82,7 +80,7 @@ case "$arch" in sed -i "s|/etc/pacman.d/mirrorlist|mirrorlist32|g" "${PACMAN_CONF}" PACMAN_MIRRORLIST='Server = http://archlinux32.andreasbaumann.cc/$arch/$repo' PACMAN_EXTRA_PKGS='archlinux32-keyring' - EXPECT_TIMEOUT=60 + EXPECT_TIMEOUT=1800 ARCH_KEYRING=archlinux32 DOCKER_IMAGE_NAME=archlinux32 ;; @@ -111,7 +109,7 @@ mount --bind $ROOTFS $MOUNTPOINT arch-chroot $MOUNTPOINT /bin/sh -c 'rm -r /usr/share/man/*' #arch-chroot $MOUNTPOINT /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate $ARCH_KEYRING; pkill gpg-agent" arch-chroot $MOUNTPOINT /bin/sh -c "pacman-key --init; pacman-key --populate $ARCH_KEYRING" -arch-chroot $MOUNTPOINT /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime" +arch-chroot $MOUNTPOINT /bin/sh -c "ln -fs /usr/share/zoneinfo/UTC /etc/localtime" echo 'en_US.UTF-8 UTF-8' > $MOUNTPOINT/etc/locale.gen arch-chroot $MOUNTPOINT locale-gen sed -i "s/Architecture.*/Architecture = i686/" "$MOUNTPOINT/etc/pacman.conf" |