Browse Source

some minor fixes to work again with current Archlinux32 version

Andreas Baumann 7 months ago
parent
commit
d8424a037c
2 changed files with 12 additions and 8 deletions
  1. 10
    4
      README.md
  2. 2
    4
      mkimage-arch.sh

+ 10
- 4
README.md View File

@@ -1,7 +1,13 @@
1
-# archlinux32-docker
1
+# docker
2 2
 
3
-from https://github.com/moby/moby/tree/master/contrib
3
+Cloned from https://github.com/moby/moby/tree/master/contrib
4 4
 
5
-edit mirror server to archlinux32
5
+# usage
6
+
7
+Run `mkimage-arch.sh` builds a docker image named `archlinux32`
8
+using `i686` architecture packages.
9
+
10
+Run `uname -m` in the shell started with
11
+`docker run -it archlinux32 /usr/bin/linux32 /bin/bash` indeed
12
+shows `i686`.
6 13
 
7
-run the sh file in a archlinux32 env

+ 2
- 4
mkimage-arch.sh View File

@@ -23,8 +23,6 @@ chmod 755 $ROOTFS
23 23
 
24 24
 # packages to ignore for space savings
25 25
 PKGIGNORE=(
26
-    cryptsetup
27
-    device-mapper
28 26
     dhcpcd
29 27
     iproute2
30 28
     jfsutils
@@ -82,7 +80,7 @@ case "$arch" in
82 80
 		sed -i "s|/etc/pacman.d/mirrorlist|mirrorlist32|g"  "${PACMAN_CONF}"
83 81
 		PACMAN_MIRRORLIST='Server = http://archlinux32.andreasbaumann.cc/$arch/$repo'
84 82
 		PACMAN_EXTRA_PKGS='archlinux32-keyring'
85
-		EXPECT_TIMEOUT=60
83
+		EXPECT_TIMEOUT=1800
86 84
 		ARCH_KEYRING=archlinux32
87 85
 		DOCKER_IMAGE_NAME=archlinux32
88 86
 		;;
@@ -111,7 +109,7 @@ mount --bind $ROOTFS $MOUNTPOINT
111 109
 arch-chroot $MOUNTPOINT /bin/sh -c 'rm -r /usr/share/man/*'
112 110
 #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"
113 111
 arch-chroot $MOUNTPOINT /bin/sh -c "pacman-key --init; pacman-key --populate $ARCH_KEYRING"
114
-arch-chroot $MOUNTPOINT /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
112
+arch-chroot $MOUNTPOINT /bin/sh -c "ln -fs /usr/share/zoneinfo/UTC /etc/localtime"
115 113
 echo 'en_US.UTF-8 UTF-8' > $MOUNTPOINT/etc/locale.gen
116 114
 arch-chroot $MOUNTPOINT locale-gen
117 115
 sed -i "s/Architecture.*/Architecture = i686/" "$MOUNTPOINT/etc/pacman.conf"