From d8424a037c7149616097dbf9aba9c25ad2bd35b0 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 1 Feb 2019 17:04:27 +0100
Subject: some minor fixes to work again with current Archlinux32 version

---
 README.md       | 14 ++++++++++----
 mkimage-arch.sh |  6 ++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2d61f20..539c6ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,13 @@
-# archlinux32-docker
+# docker
 
-from https://github.com/moby/moby/tree/master/contrib
+Cloned from https://github.com/moby/moby/tree/master/contrib
 
-edit mirror server to archlinux32
+# usage
+
+Run `mkimage-arch.sh` builds a docker image named `archlinux32`
+using `i686` architecture packages.
+
+Run `uname -m` in the shell started with
+`docker run -it archlinux32 /usr/bin/linux32 /bin/bash` indeed
+shows `i686`.
 
-run the sh file in a archlinux32 env
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"
-- 
cgit v1.2.3