adapted to some upstream changes in pacstrap, also using working mirrors

3 files changed, 18 insertions, 15 deletions

diff --git a/mirrorlist32 b/mirrorlist32
index 593a2f1..02a577c 100644
--- a/mirrorlist32
+++ b/mirrorlist32
@@ -1 +1 @@
-Server = https://pool.mirror.archlinux32.org/$arch/$repo
+Server = https://archlinux32.andreasbaumann.cc/$arch/$repo
diff --git a/mkimage-arch-pacman.conf b/mkimage-arch-pacman.conf
index 45fe03d..5958ecc 100644
--- a/mkimage-arch-pacman.conf
+++ b/mkimage-arch-pacman.conf
@@ -14,12 +14,12 @@
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
+Architecture = pentium4
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
@@ -31,10 +31,10 @@ Architecture = auto
 # Misc options
 #UseSyslog
 #Color
-#TotalDownload
-# We cannot check disk space from within a chroot environment
-#CheckSpace
+#NoProgressBar
+CheckSpace
 #VerbosePkgLists
+#ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -43,8 +43,9 @@ LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
+# keyring can then be populated with the keys of all official Arch Linux and
+# Arch Linux 32 packagers with `pacman-key --populate archlinux` and
+# `pacman-key --populate archlinux32` respectively.
 
 #
 # REPOSITORIES
@@ -89,4 +90,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
diff --git a/mkimage-arch.sh b/mkimage-arch.sh
index d49b2a4..6d43e98 100755
--- a/mkimage-arch.sh
+++ b/mkimage-arch.sh
@@ -9,8 +9,8 @@ ARCHITECTURE=pentium4
 #ARCHITECTURE=i686
 #ARCHITECTURE=i486
 
-#DOCKER=docker
-DOCKER=podman
+DOCKER=docker
+#DOCKER=podman
 
 hash pacstrap &>/dev/null || {
 	echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
@@ -81,9 +81,11 @@ case "$arch" in
 		fi
 		PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX)
 		sed "s/Architecture.*/Architecture = ${ARCHITECTURE}/"  './mkimage-arch-pacman.conf' > "${PACMAN_CONF}"
-		echo 'Server = https://pool.mirror.archlinux32.org/$arch/$repo' > mirrorlist32
+		#echo 'Server = https://pool.mirror.archlinux32.org/$arch/$repo' > mirrorlist32
+		echo 'Server = https://archlinux32.andreasbaumann.cc/$arch/$repo' > mirrorlist32
 		sed -i "s|/etc/pacman.d/mirrorlist|mirrorlist32|g"  "${PACMAN_CONF}"
-		PACMAN_MIRRORLIST='Server = https://pool.mirror.archlinux32.org/$arch/$repo'
+		#PACMAN_MIRRORLIST='Server = https://pool.mirror.archlinux32.org/$arch/$repo'
+		PACMAN_MIRRORLIST='Server = https://archlinux32.andreasbaumann.cc/$arch/$repo'
 		PACMAN_EXTRA_PKGS='archlinux32-keyring'
 		EXPECT_TIMEOUT=1800
 		ARCH_KEYRING=archlinux32
@@ -101,12 +103,13 @@ expect <<EOF
 	}
 	set timeout $EXPECT_TIMEOUT
 
-	spawn pacstrap -C $PACMAN_CONF -c -d -G -i $ROOTFS base haveged $PACMAN_EXTRA_PKGS --ignore $PKGIGNORE
+	spawn pacstrap -C $PACMAN_CONF -c -G -i $ROOTFS base haveged $PACMAN_EXTRA_PKGS --ignore $PKGIGNORE
 	expect {
 		-exact "anyway? \[Y/n\] " { send -- "n\r"; exp_continue }
 		-exact "(default=all): " { send -- "\r"; exp_continue }
 		-exact "installation? \[Y/n\]" { send -- "y\r"; exp_continue }
 		-exact "delete it? \[Y/n\]" { send -- "y\r"; exp_continue }
+		-exact "Enter a number (default=1):" { send -- "1\r"; exp_continue }
 	}
 EOF