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

Test if snapper is properly configured before using it (#83)

Browse Source
This commit is contained in:
Maxim Baz
2020-01-17 21:53:24 +01:00
committed by GitHub
parent 21df698e04
commit 4e1b628465
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
41_snapshots-btrfs
+13 -7
View File
@@ -152,6 +152,7 @@ test_btrfs()
fi fi
set -e set -e
} }
############## ##############
### Script ### ### Script ###
############## ##############
@@ -238,12 +239,17 @@ snapshot_list()
{ {
# Query info from snapper if it is installed # Query info from snapper if it is installed
type snapper >/dev/null 2>&1 type snapper >/dev/null 2>&1
if [[ $? -eq 0 ]]; then if [ $? -eq 0 ]; then
local snapper_ids=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | cut -d'|' -f 1)) if [ -s "/etc/snapper/configs/$snapper_config" ]; then
local snapper_types=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | cut -d'|' -f 2)) printf "# Info: snapper detected, using config '$snapper_config'\n" >&2
local snapper_ids=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | cut -d'|' -f 1))
local snapper_types=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | cut -d'|' -f 2))
IFS=$'\n' IFS=$'\n'
local snapper_descriptions=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | rev | cut -d'|' -f 2 | rev)) local snapper_descriptions=($(snapper --no-dbus -t 0 -c "$snapper_config" list | tail -n +3 | rev | cut -d'|' -f 2 | rev))
else
printf "# Warning: snapper detected but config '$snapper_config' does not exist\n" >&2
fi
fi fi
IFS=$'\n' IFS=$'\n'
@@ -523,11 +529,11 @@ check_uuid_required
if [[ "$override_boot_partition_detection" == "true" ]]; then if [[ "$override_boot_partition_detection" == "true" ]]; then
printf "# Info: Override boot partition detection : enable \n" >&2 ; printf "# Info: Override boot partition detection : enable \n" >&2 ;
boot_separate boot_separate
else else
if [[ "$root_uuid" != "$boot_uuid" ]]; then if [[ "$root_uuid" != "$boot_uuid" ]]; then
printf "# Info: Separate boot partition detected \n" >&2 ; printf "# Info: Separate boot partition detected \n" >&2 ;
boot_separate boot_separate
else else
printf "# Info: Separate boot partition not detected \n" >&2 ; printf "# Info: Separate boot partition not detected \n" >&2 ;
boot_bounded boot_bounded
fi fi