Matt/grub-btrfs
1
0
Fork 0
mirror of https://github.com/Antynea/grub-btrfs.git synced 2026-03-04 04:35:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix boot_uuid_subvolume fallback (#415)

Browse Source 
Fix regression affecting systems where boot directory is not a Btrfs subvolume.
This commit is contained in:
Jalopy
2026-02-19 00:21:08 -08:00
committed by GitHub
parent 14fa71c994
commit 7e8a45ca9c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
41_snapshots-btrfs
View File

@@ -136,9 +136,11 @@ fi
[ -z "$boot_uuid" ] && print_error "Cannot determine UUID of ${boot_device}" [ -z "$boot_uuid" ] && print_error "Cannot determine UUID of ${boot_device}"
# If /boot is not a Btrfs subvolume, reuse root subvol UUID # If /boot is not a Btrfs subvolume, reuse root subvol UUID
boot_uuid_subvolume="$(btrfs subvolume show "${boot_directory}" 2>/dev/null | \ boot_uuid_subvolume="$(
awk -F':' '/^\s*UUID/ {gsub(/^[ \t]+/, "", $2); print $2}')" \ btrfs subvolume show "${boot_directory}" 2>/dev/null | \
|| boot_uuid_subvolume="UUID: $root_uuid_subvolume" awk -F':' '/^\s*UUID/ {gsub(/^[ \t]+/, "", $2); print $2; exit}'
)"
[ -z "$boot_uuid_subvolume" ] && boot_uuid_subvolume="$root_uuid_subvolume"
# Extra data for GRUB commands # Extra data for GRUB commands
boot_hs="$(${grub_probe} --device "${boot_device}" --target=hints_string 2>/dev/null)" boot_hs="$(${grub_probe} --device "${boot_device}" --target=hints_string 2>/dev/null)"