Breadway/bos
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 8 Packages Wiki Activity Actions

iso: print GRUB snapshot recovery after bos-update

Browse source 
Recovery is reboot → GRUB “snapshots” submenu. snapper rollback
does not change what GRUB boots (rootflags=subvol=@). Same wording
in README Recovery and docs/hardware.md.
This commit is contained in:
Breadway 2026-08-16 00:48:25 +08:00
parent f3d6c55234
commit 43c0a5e2b5
3 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
README.md
View file

@ -264,7 +264,7 @@ also get live systemd status + Start/Stop/Restart/Logs.
| Packages | `bakery` installed list + updates, pacman system update | | Packages | `bakery` installed list + updates, pacman system update |
| AUR | Search via `yay`; installing opens a terminal (AUR build scripts need review) | | AUR | Search via `yay`; installing opens a terminal (AUR build scripts need review) |
| Firmware | `fwupd` device list + updates | | Firmware | `fwupd` device list + updates |
| Snapshots | `snapper` list / boot-into (grub-btrfs) / delete | | Snapshots | `snapper` list (number / date / description); reboot to pick in GRUB (grub-btrfs); delete |
Source and build live in the [bos-settings](https://git.breadway.dev/Breadway/bos-settings) Source and build live in the [bos-settings](https://git.breadway.dev/Breadway/bos-settings)
repo, not here. repo, not here.
@ -382,15 +382,16 @@ until `dl.breadway.dev/arch` exists).
## Recovery ## Recovery
**An update broke something (system still boots):** open BOS Settings → **An update broke something (system still boots):** reboot → **GRUB
Snapshots and pick a snapshot to boot, **or** choose one from the **GRUB “snapshots” submenu** (grub-btrfs), then boot that entry.
“snapshots” submenu** (grub-btrfs) at boot, then reboot into it.
Do **not** run `snapper rollback` as the default recovery step. BOS GRUB BOS Settings → Snapshots lists each snapshot’s number, date, and
pins `rootflags=subvol=@`, so a snapper-swapped default subvolume is not description so you know which GRUB entry to pick. It does not roll the
what the installed grub.cfg will boot next. Use the grub-btrfs entry so the running root back in place.
kernel command line matches the snapshot you want. Details:
[docs/hardware.md](docs/hardware.md). Do **not** run `snapper rollback`. BOS GRUB pins `rootflags=subvol=@`, so
a snapper-swapped default subvolume is not what the installed grub.cfg
will boot next. Details: [docs/hardware.md](docs/hardware.md).
A/B root swapping (SteamOS-style) is a **future** idea in DESIGN.md — it is A/B root swapping (SteamOS-style) is a **future** idea in DESIGN.md — it is
not shipped. not shipped.

18
docs/hardware.md
View file

@ -19,14 +19,18 @@ A VM without `/dev/dri` gets a notification only.
## Recovery ## Recovery
An update that breaks the system is recovered from the **GRUB "snapshots" An update that breaks the system is recovered by **reboot → GRUB
submenu** (grub-btrfs), not `snapper rollback`. “snapshots” submenu** (grub-btrfs). `snapper rollback` will not change
what GRUB boots (`rootflags=subvol=@`).
BOS GRUB pins `rootflags=subvol=@`. `snapper rollback` swaps the default `snapper rollback` swaps the default subvolume; the installed `grub.cfg`
subvolume; the installed `grub.cfg` will still boot `@`. Pick the grub-btrfs still boots `@`. Pick the grub-btrfs entry so the kernel command line
entry so the kernel command line matches the snapshot you want. Bakery matches the snapshot you want.
desktop apps live under `/usr/local` on `@`, so those same snapshots
include them. BOS Settings → Snapshots lists snapshot number, date, and description so
you know which GRUB entry to pick. It does not roll the running root back
in place. Bakery desktop apps live under `/usr/local` on `@`, so those
same snapshots include them.
If the system will not boot (lost EFI entry / broken GRUB), boot the live If the system will not boot (lost EFI entry / broken GRUB), boot the live
ISO and run `sudo bos-rescue`. It mounts `@` + the ESP and offers the same ISO and run `sudo bos-rescue`. It mounts `@` + the ESP and offers the same

4
iso/airootfs/usr/local/bin/bos-update
View file

@ -54,3 +54,7 @@ fi
echo echo
bold "==> BOS is up to date." bold "==> BOS is up to date."
echo
bold "Recovery"
echo "If this update goes badly: reboot → GRUB “snapshots” submenu."
echo "snapper rollback will not change what GRUB boots (rootflags=subvol=@)."