lots: shellcheck, streaming stuff, fixes

[distro-setup] / schrootupdate

diff --git a/schrootupdate b/schrootupdate
index 533e087d010fdf47dd73a4a63b44d49449f3439f..42321c0598ed3615991dcd1c6d6441d2648e33de 100755 (executable)
--- a/schrootupdate
+++ b/schrootupdate
@@ -5,10 +5,43 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-for n in bullseye; do
-  if [[ -e /etc/schroot/chroot.d/$n.conf ]]; then
-    cd /
-    schroot -c $n -- apt-get -y update
-    schroot -c $n -- apt-get -y dist-upgrade --purge --auto-remove
+# used to have more than one, leaving commented in case we do
+#for n in bullseye; do
+n=bullseye
+if [[ -e /etc/schroot/chroot.d/$n.conf ]]; then
+  cd /
+  schroot -c $n -- apt-get -y update
+  schroot -c $n -- apt-get -y dist-upgrade --purge --auto-remove
+fi
+#done
+
+# if we haven't upgraded yet
+if [[ ! -d /mnt/boot/debianbullseye_bootstrap ]]; then
+  exit 0
+fi
+
+dev=$(awk '$2 == "/mnt/boot" {print $1}' /etc/mtab)
+if [[ ! $dev ]]; then
+  exit 0
+fi
+mkdir -p /mnt/tmptimer
+if ! mountpoint /mnt/tmptimer &>/dev/null; then
+  mount -o subvol=debianbullseye_bootstrap $dev /mnt/tmptimer
+fi
+cd /mnt/tmptimer
+for d in dev proc sys dev/pts; do
+  [[ -d $d ]]
+  if ! mountpoint $d &>/dev/null; then
+    mount -o bind /$d $d
+  fi
+done
+chroot . apt-get -y update
+chroot . apt-get -y dist-upgrade --purge --auto-remove
+
+for d in dev/pts dev proc sys; do
+  if mountpoint $d &>/dev/null; then
+    umount $d
   fi
 done
+cd /
+umount /mnt/tmptimer