A few more fixes for cases where scripts are rerun

build_fsimg.sh

@@ -20,6 +20,7 @@ ls /dev/loop0 || mknod /dev/loop0 b 7 0 || {
 
 mount -o loop "$I" "$M" || exit 1
 function clean_up () {
+    set +e
     umount -l "$M"
     rm -d "$M"
 }

build_qcow2.sh

@@ -24,6 +24,7 @@ mkdir -p "$M"
 
 mount "$L"p1 "$M" || exit 1
 function clean_up_loop () {
+    set +e
     umount -l "$M"
     losetup -d "$L"
     rm -d "$M"
@@ -38,6 +39,7 @@ mount --bind {,"$M"}/proc
 mount --bind {,"$M"}/sys
 
 function clean_up_all () {
+    set +e
     umount "$M"/{sys,proc,dev/pts,dev,}
     clean_up_loop
 }

configure_stage3.sh

@@ -22,7 +22,7 @@ mkdir -p \
 
 # Start systemd services
 for svc in networkd resolved timesyncd; do
-ln -s "/usr/lib64/systemd/system/systemd-${svc}.service" \
+ln -sf"/usr/lib64/systemd/system/systemd-${svc}.service" \
     "chroot/etc/systemd/system/multi-user.target.wants/systemd-${svc}.service"
 done
 cat << EOF > chroot/etc/systemd/network/dhcp.network
@@ -37,7 +37,7 @@ ln -sf /run/systemd/resolve/resolv.conf chroot/etc/resolv.conf
 # Cloud-init
 ## Bug: cloud-init.service should not need sshd-keygen.service in Gentoo
 for svc in config final init init-local; do
-ln -s "/usr/lib64/systemd/system/cloud-${svc}.service" \
+ln -sf"/usr/lib64/systemd/system/cloud-${svc}.service" \
     "chroot/etc/systemd/system/multi-user.target.wants/cloud-${svc}.service"
 done
 
@@ -132,7 +132,7 @@ EOF
 
 # Enable LVM socket daemons
 for socket in lvm2-lvmetad dm-event; do
-ln -s "/usr/lib64/systemd/system/${socket}.socket" \
+ln -sf"/usr/lib64/systemd/system/${socket}.socket" \
     "chroot/etc/systemd/system/multi-user.target.wants/${socket}.socket"
 done
 
@@ -141,7 +141,7 @@ echo > chroot/etc/machine-id
 
 # SSH oddity
 chown root chroot/var/empty
-ln -s '/usr/lib64/systemd/system/sshd.service' \
+ln -sf'/usr/lib64/systemd/system/sshd.service' \
     'chroot/etc/systemd/system/multi-user.target.wants/sshd.service'
 
 rm -f /root/systemd.squashfs || true