From 3c5089dc007710b16d7a2adc78c17d1d1b1654e9 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 24 Aug 2017 14:20:14 +0200
Subject: fixed all kind of trouble with hanging bridge creation and package
 signatures

---
 archauto.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'archauto.sh')

diff --git a/archauto.sh b/archauto.sh
index 20ec948..55f1abc 100755
--- a/archauto.sh
+++ b/archauto.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+exec > >(tee -i logfile.txt)
+exec 2>&1
+
 # configuration
 
 INSTALL_DRIVE=/dev/vda
@@ -48,7 +51,6 @@ echo "Installing keyring for ArchLinux32."
 
 sed -i 's/^SigLevel.*/SigLevel = Never/g' /etc/pacman.conf
 pacman --noconfirm -Syyw archlinux32-keyring
-sed -i 's/^SigLevel.*/SigLevel = Required DatabaseOptional/g' /etc/pacman.conf
 pacman --noconfirm -U /var/cache/pacman/pkg/archlinux32-keyring-*.pkg.tar.xz
 
 echo "Installing minimalistic base system.."
@@ -56,14 +58,13 @@ echo "Installing minimalistic base system.."
 pacstrap ${MOUNT_PATH} filesystem grep findutils coreutils glibc bash pacman \
 	mkinitcpio linux dhcpcd systemd sed systemd-sysvcompat
 
-echo "Patching pacman in chroot to play locally.."
+sed -i 's/^SigLevel.*/SigLevel = Never/g' ${MOUNT_PATH}/etc/pacman.conf
 
 cat >${MOUNT_PATH}/etc/pacman.d/mirrorlist <<EOF
 Server = ${HTTP_SERVER}/mirror/\$arch/\$repo
 EOF
 
 echo "Test if we can update the system inside chroot."
-
 arch-chroot ${MOUNT_PATH} pacman -Syyu
 
 echo "Install /etc/fstab"
@@ -104,6 +105,9 @@ arch-chroot ${MOUNT_PATH} pacman --noconfirm -S openssh
 echo "PermitRootLogin yes" >>${MOUNT_PATH}/etc/ssh/sshd_config
 arch-chroot ${MOUNT_PATH} systemctl enable sshd
 
+# maybe later, when pacman knows the Archlinux32 developer keys
+#sed -i 's/^SigLevel.*/SigLevel = Required DatabaseOptional/g' ${MOUNT_PATH}/etc/pacman.conf
+
 echo "Unmounting.."
 
 umount ${MOUNT_PATH}/boot
-- 
cgit v1.2.3-54-g00ecf