diff options
Diffstat (limited to 'f3s')
| -rw-r--r-- | f3s/pi-netbsd/NETBSD-11-PI1-UPGRADE.md | 167 |
1 files changed, 167 insertions, 0 deletions
diff --git a/f3s/pi-netbsd/NETBSD-11-PI1-UPGRADE.md b/f3s/pi-netbsd/NETBSD-11-PI1-UPGRADE.md new file mode 100644 index 0000000..30b9871 --- /dev/null +++ b/f3s/pi-netbsd/NETBSD-11-PI1-UPGRADE.md @@ -0,0 +1,167 @@ +# pi1 NetBSD 11.0 upgrade staging + +This records the staging completed on 2026-08-03. It is deliberately **not** +an upgrade procedure that has already been run: no 11.0 kernel, modules, sets, +or boot files have been installed and pi1 has not been rebooted. + +## Verified release inputs + +Only the formal `NetBSD-11.0/evbarm-aarch64` release was used: + +```text +https://cdn.netbsd.org/pub/NetBSD/NetBSD-11.0/evbarm-aarch64/ +``` + +The 11.0 `INSTALL.txt`, `LAST_MINUTE`, release announcement/notes, and the +installed `sysupgrade(8)` manual were reviewed. `LAST_MINUTE` says there is +nothing pertinent. The evbarm INSTALL recommends `sysupgrade`, explicitly +calls out updating the applicable DTB and `bootaa64.efi`, and gives the safe +major-upgrade order: fetch, kernel, modules, reboot, sets, etcupdate, +postinstall, reboot. + +The signed release hash manifest is +`https://cdn.netbsd.org/pub/NetBSD/security/hashes/NetBSD-11.0_hashes.asc`. +`gpgv` reported a good signature from RSA key `89261E17F5EF49FF`, the NetBSD +Security Officer 2019 key obtained from the formal NetBSD CDN. SHA512 values +for every fetched set/kernel and for `arm64.img.gz` were checked against that +signed manifest. The image hash is: + +```text +50c8597cd83b73d12a466e67c1ecc49fb1969941171644b15a7fe377b0f482ccb190b3aa38b043eba3f5e7b4d6e38cf0e7d3c6fd5251813af869b49beda2ee80 +``` + +## Current boot path and comparison + +pi1 is a Raspberry Pi 3 Model B Plus (BCM2837). It boots directly through the +Raspberry Pi firmware, **not** U-Boot or EFI. `/boot/config.txt` selects +`kernel=/netbsd.img`, `os_prefix=dtb/broadcom/`, and 64-bit mode. Consequently +the selected DTB is `dtb/broadcom/bcm2837-rpi-3-b-plus.dtb`. +`/boot/EFI/BOOT/bootaa64.efi` exists in the image but is not on this boot path. + +The 10.1 and 11.0 `arm64.img` EFI partitions have identical file lists. +`config.txt`, `cmdline.txt`, the BCM2837 DTB, and all Raspberry Pi firmware +files are byte-identical. Only `netbsd.img`, `bootaa64.efi`, and several +unrelated RK3399 DTBs differ. There are therefore no local modifications to +`config.txt` or `cmdline.txt` relative to the release image. Their contents +remain: + +```text +# +upstream_kernel=1 +# +arm_64bit=1 +os_prefix=dtb/broadcom/ +cmdline=../../cmdline.txt +kernel=/netbsd.img +kernel_address=0x200000 +enable_uart=1 +force_turbo=0 +``` + +```text +root=NAME=netbsd-root console=fb +``` + +Release-managed 11.0 boot files are staged under +`/var/cache/netbsd-11.0-boot`; preserved local `config.txt` and `cmdline.txt` +copies are in the same directory. Fetched sets and `netbsd-GENERIC64.gz` are +under `/var/cache/sysupgrade`. Do not copy staged files blindly: only the +BCM2837 B+ DTB and direct-boot `netbsd.img` apply to pi1; EFI is retained for +reference/recovery and the firmware is byte-identical. + +## Install commands for the later upgrade task + +Run these only during an approved maintenance window with physical SD access. +First preserve the live boot partition again: + +```sh +set -e +stamp=$(date +%Y%m%dT%H%M%S) +doas mkdir -p "/var/backups/boot-$stamp" +doas cp -Rp /boot/. "/var/backups/boot-$stamp/" +doas cp -p /netbsd "/netbsd.pre-11-$stamp" +``` + +Install the applicable boot files while leaving the local configuration +untouched. This is not transactional on FAT, which is why physical SD recovery +is a prerequisite. Verify each temporary copy before renaming it: + +```sh +set -e +doas cp -p /var/cache/netbsd-11.0-boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb /boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb.new +doas cmp /var/cache/netbsd-11.0-boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb /boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb.new +doas mv /boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb.new /boot/dtb/broadcom/bcm2837-rpi-3-b-plus.dtb +doas cp -p /var/cache/netbsd-11.0-boot/netbsd.img /boot/netbsd.img.new +doas cmp /var/cache/netbsd-11.0-boot/netbsd.img /boot/netbsd.img.new +doas mv /boot/netbsd.img.new /boot/netbsd.img +doas sync +doas /usr/pkg/sbin/sysupgrade kernel +doas /usr/pkg/sbin/sysupgrade modules +``` + +`sysupgrade kernel` updates the conventional `/netbsd`; the separately staged +`netbsd.img` is the kernel that the Pi firmware actually loads. Both must be +kept at the same release. Do **not** replace `config.txt` or `cmdline.txt`. Do +not install `bootaa64.efi` for this direct-firmware boot path. Reboot once, +confirm `uname -r` is 11.0, then complete the post-reboot half exactly as the +INSTALL specifies: + +```sh +set -e +doas /usr/pkg/sbin/sysupgrade sets +doas /usr/pkg/sbin/sysupgrade etcupdate +doas /usr/pkg/sbin/sysupgrade postinstall +doas sync +``` + +Before the final reboot, verify `sysupgrade postinstall` succeeded. After it, +verify `uname -a`, `npfctl show`, all five rc.d services (`bozohttpd`, +`wireguard`, `uptimed`, `npf`, and `dserver`), `curl -fsI http://localhost/`, +and public service through both frontends while pi0 remains online. + +## Restore and recovery + +`/netbsd.old` is an SHA512-identical copy of the running 10.1 `/netbsd`. +Note that `sysupgrade kernel` itself backs up to `/onetbsd`, not +`/netbsd.old`. A kernel-only rollback is valid only before `sysupgrade +modules` has run. In that narrow case, restore the stamped root kernel and the +entire saved boot tree (the direct-boot `netbsd.img` is not interchangeable +with `/netbsd`): + +```sh +doas cp -p /netbsd.pre-11-YYYYMMDDTHHMMSS /netbsd +doas cp -Rp /var/backups/boot-YYYYMMDDTHHMMSS/. /boot/ +doas sync +``` + +`/netbsd.old` is the additional pre-staged fallback; the timestamped copy is +the maintenance-window rollback source. Once 11.0 modules or userland sets +have been installed, do not attempt a kernel-only rollback: restore the +complete fishfinger backup or reinstall/restore the SD card so kernel, +modules, and userland remain matched. + +For a failure before multi-user mode, use HDMI/keyboard (the console is +`console=fb`) or remove the SD card and restore the saved EFI partition/files +from another system. `enable_uart=1` is set, but the kernel command line does +not currently select a serial console, so serial must not be the only recovery +plan. A durable full backup exists on fishfinger at +`/home/rex/backups/pi1-20260803`, and pi0 keeps the web service available. +Physical SD recovery is explicitly unavailable/accepted until approximately +2026-08-05, so the actual upgrade must wait until then. + +## Staged configuration and capacity + +`sysutils/sysupgrade` 1.5nb12 is installed. Its configuration is: + +```text +RELEASEDIR="https://cdn.netbsd.org/pub/NetBSD/NetBSD-11.0/evbarm-aarch64/" +ARCHIVE_EXTENSION=tar.xz +KERNEL=AUTO +SETS=AUTO +POSTINSTALL_AUTOFIX="obsolete" +AUTOCLEAN=no +``` + +The fetch cache is 219 MiB and the boot staging tree is 23 MiB. After staging, +the root filesystem had 17 GiB free and `/boot` had 47 MiB free. Services were +left running and no reboot occurred. |