incus-container-upgrade: record the real OS as user.os after each run

incus list -c config:image.description reports the image a container
was CREATED from (2019 for most of this fleet) and says nothing about
dist-upgrades since — misleading as an inventory. The script now sets
user.os / user.os-checked from /etc/os-release on every pass, leaving
image.* intact as provenance. -o refreshes the metadata without
upgrading anything.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

incus-container-upgrade.sh

@@ -3,12 +3,30 @@
 # apt dist-upgrade of all RUNNING containers (containers only — VMs are
 # excluded, they may not run an agent or apt at all). Containers without
 # apt are skipped. Exits non-zero if any upgrade failed.
+#
+# Also refreshes `user.os` / `user.os-checked` on each container, so
+#   incus list -c n,config:user.os,config:user.os-checked
+# always shows the OS the container actually runs. (`image.description`
+# is deliberately left alone: it records what the instance was created
+# from — 2019 images for most of this fleet — which is history worth
+# keeping, not an inventory.)
+#
+# Usage: incus-container-upgrade.sh [-o]     # -o: only refresh user.os,
+#                                            #     skip the upgrades
 
 set -uo pipefail
 
 INCUS=/usr/bin/incus
 LOG=/var/log/incus-container-upgrade.log
 LOCKFILE=/run/lock/incus-container-upgrade.lock
+OSONLY=0
+
+while getopts o flag; do
+    case "${flag}" in
+        o) OSONLY=1;;
+        *) echo "Usage: $0 [-o]" >&2; exit 2;;
+    esac
+done
 
 # refuse to overlap with a previous, still-running invocation
 exec 9> "$LOCKFILE"
@@ -29,12 +47,25 @@ distUpgrade() {
     $INCUS exec "$CT" --env DEBIAN_FRONTEND=noninteractive -- apt-get -qq -y dist-upgrade
 }
 
+# record the OS the container actually runs; failures here never fail
+# the upgrade (it is metadata, not the job)
+recordOS() {
+    local CT=$1 OS
+    OS=$($INCUS exec "$CT" -- sh -c '. /etc/os-release 2>/dev/null && echo "$PRETTY_NAME"' 2>/dev/null)
+    [ -n "$OS" ] || return 0
+    $INCUS config set "$CT" user.os="$OS" user.os-checked="$(date +%F)" 2>/dev/null \
+        || echo "$CT: could not record user.os" >&2
+}
+
 RC=0
 for CT in $($INCUS list -c n -f csv status=RUNNING type=container); do
-    if ! distUpgrade "$CT" 2>&1 | tee -a "$LOG"; then
+    if [ "$OSONLY" -eq 0 ]; then
-        echo "[$(date '+%F %T')] FAILED: $CT" | tee -a "$LOG" >&2
+        if ! distUpgrade "$CT" 2>&1 | tee -a "$LOG"; then
-        RC=1
+            echo "[$(date '+%F %T')] FAILED: $CT" | tee -a "$LOG" >&2
+            RC=1
+        fi
     fi
+    recordOS "$CT"
 done
 
 exit $RC