From e6898c0de824662f67676f943995a7296b45ab5f Mon Sep 17 00:00:00 2001 From: Antynea Date: Thu, 21 Oct 2021 16:36:12 +0200 Subject: [PATCH] Update disable_script function * Update disable_script function: * A function is no longer required since the commands have been moved to the beginning of the script. --- 41_snapshots-btrfs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs index 5ef03fb..aca653d 100755 --- a/41_snapshots-btrfs +++ b/41_snapshots-btrfs @@ -44,16 +44,12 @@ grub_btrfs_config="${sysconfdir}/default/grub-btrfs/config" [[ -f "${sysconfdir}/default/grub" ]] && . "${sysconfdir}/default/grub" ## Exit the script, if: -disable_script() { - [[ "${GRUB_BTRFS_DISABLE:-"false"}" == "true" ]] && exit 0 # Disable Grub-btrfs is set to true (default=false) - if ! type btrfs >/dev/null 2>&1; then exit 0; fi # btrfs-progs isn't installed - [[ -f "$datarootdir/grub/grub-mkconfig_lib" ]] && . "$datarootdir/grub/grub-mkconfig_lib" || exit 0 # grub-mkconfig_lib couldn't be found - # Root filesystem isn't btrfs - root_fs=$(${grub_probe} --target="fs" / 2>/dev/null) - [[ "$root_fs" != "btrfs" ]] && exit 0 - return 0 -} -disable_script +[[ "${GRUB_BTRFS_DISABLE,,}" == "true" ]] && exit 0 # Disable Grub-btrfs is set to true (default=false) +if ! type btrfs >/dev/null 2>&1; then exit 0; fi # btrfs-progs isn't installed +[[ -f "$datarootdir/grub/grub-mkconfig_lib" ]] && . "$datarootdir/grub/grub-mkconfig_lib" || exit 0 # grub-mkconfig_lib couldn't be found +# Root filesystem isn't btrfs +root_fs=$(${grub_probe} --target="fs" / 2>/dev/null) +[[ "$root_fs" != "btrfs" ]] && exit 0 ## Submenu name distro=$(awk -F "=" '/^NAME=/ {gsub(/"/, "", $2); print $2}' /etc/os-release)