X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=schrootupdate;h=832b0157def6d9bd9bc5d75df59a2308befb264a;hp=533e087d010fdf47dd73a4a63b44d49449f3439f;hb=HEAD;hpb=b18dade73dedfe69aa741f8417947d83c4208f2d

diff --git a/schrootupdate b/schrootupdate
index 533e087..df3cfe0 100755
--- a/schrootupdate
+++ b/schrootupdate
@@ -1,14 +1,68 @@
 #!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 set -eE -o pipefail
 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