ops(pfi-pve): upgraded to PVE 9.2.21 / kernel 7.0.14-20; reboot test + post-check recorded; pre-reboot checks corrected for PVE 9

playbooks/pfi-pve-pve9-prereboot.yaml

@@ -45,7 +45,8 @@ verify:
       set -e
       ls -la --time-style=long-iso /boot/efi/EFI/proxmox/ /boot/efi/EFI/BOOT/
       test "$(md5sum < /boot/efi/EFI/proxmox/grubx64.efi)" = "$(md5sum < /boot/efi/EFI/BOOT/BOOTX64.EFI)"
-      strings /boot/efi/EFI/proxmox/grubx64.efi | grep -m1 -E '^2\.1[2-9]' || strings /boot/efi/EFI/proxmox/grubx64.efi | grep -m1 -i 'grub 2\.1'
+      # The binary carries no greppable version string; the trixie grub-efi-amd64 postinst's own report is the proof.
+      grep -q 'Installation finished. No error reported.' /root/pve9-upgrade.log
       first=$(efibootmgr | sed -n 's/^BootOrder: \([0-9A-F]*\).*/\1/p')
       efibootmgr -v | grep -E "^Boot${first}\*? " | grep -qi 'EFI\\proxmox\\grubx64.efi'
     changed_when: "false"
@@ -55,7 +56,13 @@ verify:
       set -e
       dpkg-query -W -f='${Status}' isc-dhcp-client | grep -q 'install ok installed' || dpkg-query -W -f='${Status}' dhcpcd-base | grep -q 'install ok installed'
       dpkg-query -W -f='${Status}' ifupdown2 | grep -q 'install ok installed'
-      ifreload -a -s
+      # ifupdown2 3.3 (PVE 9) flags PVE's own `bridge-fd 0` as out of range and `-s` exits 1 on that warning alone.
+      # nh3-pve and esh-nas-pve show the same warning and booted with vmbr0 fine (STP off, forward_delay 0), so
+      # only a warning OTHER than that one fails this check.
+      out=$(ifreload -a -s 2>&1) || true
+      echo "$out"
+      # (an `if`, not a bare `! pipeline`: set -e ignores a negated pipeline, so that form could never fail)
+      if echo "$out" | grep -v 'bridge-fd: value of out range "0"' | grep -q .; then echo "unexpected ifupdown2 output"; exit 1; fi
       test -z "$(grep -vE '^\s*(#|$)' /etc/sysctl.conf 2>/dev/null)"
     changed_when: "false"
   - name: pve8to9 --full (post-upgrade checks)