diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs index 0e9d7c0..07c57ed 100755 --- a/41_snapshots-btrfs +++ b/41_snapshots-btrfs @@ -92,7 +92,7 @@ grub_directory=${GRUB_BTRFS_GRUB_DIRNAME:-"/boot/grub"} ## Customize BOOT directory, where kernels/initrams/microcode is saved. boot_directory=${GRUB_BTRFS_BOOT_DIRNAME:-"/boot"} ## Customize GRUB-BTRFS.cfg directory, where "grub-btrfs.cfg" file is saved -grub_btrfs_directory=${GRUB_BTRFS_GBTRFS_DIRNAME:-"/boot/grub"} +grub_btrfs_directory=${GRUB_BTRFS_GBTRFS_DIRNAME:-${grub_directory}} ## Customize directory where "grub-btrfs.cfg" file is searched for by grub grub_btrfs_search_directory=${GRUB_BTRFS_GBTRFS_SEARCH_DIRNAME:-"\${prefix}"} ## Password protection management for submenu diff --git a/config b/config index 50905b9..9432a81 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ #!/usr/bin/env bash -GRUB_BTRFS_VERSION=4.12-master-2022-12-04T21:11:00+00:00 +GRUB_BTRFS_VERSION=4.12-improve-config-2022-12-05T20:15:10+00:00 # Disable grub-btrfs. # Default: "false" @@ -88,7 +88,6 @@ GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/doc #GRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION="true" # Location of the folder containing the "grub.cfg" file. -# Use by grub-btrfs to save the file "grub-btrfs.cfg". # Might be grub2 on some systems. # For example, on Fedora with EFI : "/boot/efi/EFI/fedora" # Default: "/boot/grub" @@ -100,10 +99,10 @@ GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/doc #GRUB_BTRFS_BOOT_DIRNAME="/boot" # Location where grub-btrfs.cfg should be saved. -# Some distributions (like OpenSuSE) store those file at the snapshot directory +# Some distributions (like OpenSuSE) store those files at the snapshot directory # instead of boot. Be aware that this direcory must be available for grub during # startup of the system. -# Default: "/boot/grub" +# Default: $GRUB_BTRFS_GRUB_DIRNAME #GRUB_BTRFS_GBTRFS_DIRNAME="/boot/grub" # Location of the directory where Grub searches for the grub-btrfs.cfg file. diff --git a/manpages/grub-btrfs.8.man b/manpages/grub-btrfs.8.man index 7ba4c1e..8a522ec 100644 --- a/manpages/grub-btrfs.8.man +++ b/manpages/grub-btrfs.8.man @@ -1,4 +1,4 @@ -.TH "grub-btrfs" "8" +.TH "grub-btrfs" "1" .SH "NAME" .PP @@ -185,7 +185,7 @@ startup of the system. .IP \(em 4 Default: “/boot/grub” .IP \(em 4 -Example GRUB\d\s-2BTRFS\s+2\u\d\s-2GBTRFS\s+2\u\d\s-2DIRNAME\s+2\u=“/boot/grub” +Example: \fCGRUB_BTRFS_GBTRFS_DIRNAME="/.snapshots"\fP .SS "\fCGRUB_BTRFS_GBTRFS_SEARCH_DIRNAME\fP" .PP diff --git a/manpages/grub-btrfs.8.org b/manpages/grub-btrfs.8.org index 0867bb5..9eb21a2 100644 --- a/manpages/grub-btrfs.8.org +++ b/manpages/grub-btrfs.8.org @@ -123,7 +123,6 @@ Used by "grub-btrfs" to detect the boot partition and the location of kernels, i *** ~GRUB_BTRFS_GRUB_DIRNAME~ Location of the folder containing the "grub.cfg" file. -Used by grub-btrfs to save the file "grub-btrfs.cfg". Might be grub2 on some systems. For example, on Fedora with EFI : "/boot/efi/EFI/fedora" - Default: "/boot/grub" @@ -134,8 +133,8 @@ For example, on Fedora with EFI : "/boot/efi/EFI/fedora" Some distributions (like OpenSuSE) store those file at the snapshot directory instead of boot. Be aware that this direcory must be available for grub during startup of the system. -- Default: "/boot/grub" -- Example GRUB_BTRFS_GBTRFS_DIRNAME="/boot/grub" +- Default: $GRUB_BTRFS_GRUB_DIRNAME +- Example: ~GRUB_BTRFS_GBTRFS_DIRNAME="/.snapshots"~ *** ~GRUB_BTRFS_GBTRFS_SEARCH_DIRNAME~ Location of the directory where Grub searches for the grub-btrfs.cfg file. @@ -148,7 +147,6 @@ installed. (like /boot/grub, /boot/efi/grub)) with `\` before the `$` - Example: GRUB_BTRFS_GBTRFS_SEARCH_DIRNAME="\${prefix}" - *** ~GRUB_BTRFS_MKCONFIG~ Name/path of the command to generate the grub menu, used by "grub-btrfs.service" Might be 'grub2-mkconfig' on some systems (e.g. Fedora)