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

grub-btrfs: get back the grub_btrfs_search_directory functionality

Browse Source 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
This commit is contained in:
Pascal Jäger
2023-03-26 19:20:08 +02:00
parent 1556c345da
commit ec5ff8b4bc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
41_snapshots-btrfs
View File

@@ -130,7 +130,7 @@ CLASS="--class snapshots --class gnu-linux --class gnu --class os"
oldIFS=$IFS oldIFS=$IFS
## Detect uuid requirement (lvm,btrfs...) ## Detect uuid requirement (lvm,btrfs...)
check_uuid_required() { check_uuid_required() {
if [ "x${root_uuid}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ if [ "${root_uuid}" = "" ] || [ "${GRUB_DISABLE_LINUX_UUID}" = "true" ] \
|| ! test -e "/dev/disk/by-uuid/${root_uuid}" \ || ! test -e "/dev/disk/by-uuid/${root_uuid}" \
|| ( test -e "${root_device}" && uses_abstraction "${root_device}" lvm ); then || ( test -e "${root_device}" && uses_abstraction "${root_device}" lvm ); then
LINUX_ROOT_DEVICE=${root_device} LINUX_ROOT_DEVICE=${root_device}
@@ -295,7 +295,7 @@ snapshot_list()
IFS=$'\n' IFS=$'\n'
for snap in $(btrfs subvolume list -sa "${btrfs_subvolume_sort}" /); do # Parse btrfs snapshots for snap in $(btrfs subvolume list -sa "${btrfs_subvolume_sort}" /); do # Parse btrfs snapshots
IFS=$oldIFS IFS=$oldIFS
snap=($snap) snap=("${snap}")
local path_snapshot=${snap[@]:13:${#snap[@]}} local path_snapshot=${snap[@]:13:${#snap[@]}}
if [ "$path_snapshot" = "DELETED" ]; then continue; fi # Discard deleted snapshots if [ "$path_snapshot" = "DELETED" ]; then continue; fi # Discard deleted snapshots
[[ ${path_snapshot%%"/"*} == "<FS_TREE>" ]] && path_snapshot=${path_snapshot#*"/"} # Remove the "<FS_TREE>" string at the beginning of the path [[ ${path_snapshot%%"/"*} == "<FS_TREE>" ]] && path_snapshot=${path_snapshot#*"/"} # Remove the "<FS_TREE>" string at the beginning of the path
@@ -566,7 +566,7 @@ boot_separate()
} }
rm -f "$grub_btrfs_directory/grub-btrfs.new" rm -f "$grub_btrfs_directory/grub-btrfs.new"
> "$grub_btrfs_directory/grub-btrfs.new" # Create a "grub-btrfs.new" file in "grub_btrfs_directory" true > "$grub_btrfs_directory/grub-btrfs.new" # Create a "grub-btrfs.new" file in "grub_btrfs_directory"
# Create a backup of the "$grub_btrfs_directory/grub-btrfs.cfg" file if exist # Create a backup of the "$grub_btrfs_directory/grub-btrfs.cfg" file if exist
if [ -e "$grub_btrfs_directory/grub-btrfs.cfg" ]; then if [ -e "$grub_btrfs_directory/grub-btrfs.cfg" ]; then
mv -f "$grub_btrfs_directory/grub-btrfs.cfg" "$grub_btrfs_directory/grub-btrfs.cfg.bkp" mv -f "$grub_btrfs_directory/grub-btrfs.cfg" "$grub_btrfs_directory/grub-btrfs.cfg.bkp"
@@ -583,11 +583,11 @@ check_uuid_required
if [[ "$root_uuid" != "$boot_uuid" ]] || [[ "$root_uuid_subvolume" != "$boot_uuid_subvolume" ]]; then boot_separate ; else boot_bounded ; fi if [[ "$root_uuid" != "$boot_uuid" ]] || [[ "$root_uuid_subvolume" != "$boot_uuid_subvolume" ]]; then boot_separate ; else boot_bounded ; fi
# Make a submenu in GRUB (grub.cfg) # Make a submenu in GRUB (grub.cfg)
cat << EOF cat << EOF
if [ ! -e "\${prefix}/grub-btrfs.cfg" ]; then if [ ! -e "${grub_btrfs_search_directory}/grub-btrfs.cfg" ]; then
echo "" echo ""
else else
submenu '${submenuname}' ${protection_authorized_users}${unrestricted_access_submenu}{ submenu '${submenuname}' ${protection_authorized_users}${unrestricted_access_submenu}{
configfile "\${prefix}/grub-btrfs.cfg" configfile "${grub_btrfs_search_directory}/grub-btrfs.cfg"
} }
fi fi
EOF EOF

4
config
View File

@@ -1,7 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
<<<<<<< HEAD
GRUB_BTRFS_VERSION=4.12-HEAD-2023-03-26T17:44:56+00:00 GRUB_BTRFS_VERSION=4.12-HEAD-2023-03-26T17:44:56+00:00
=======
GRUB_BTRFS_VERSION=4.12-master-2023-03-26T17:20:08+00:00
>>>>>>> 02513bb (grub-btrfs: get bach the grub_btrfs_search_directory functionality)
# Disable grub-btrfs. # Disable grub-btrfs.
# Default: "false" # Default: "false"