From 13f263ca0cb5732adbe3007f8ab3bb757f4830fd Mon Sep 17 00:00:00 2001 From: Pierre-Alain TORET Date: Fri, 18 Nov 2016 12:10:59 +0100 Subject: [PATCH 1/2] Update the top-level subvolid from 0 to 5. According to https://btrfs.wiki.kernel.org/index.php/SysadminGuide#Subvolumes, the toplevel subvolume is 5 not 0, so I guess that's what should be used here. Also fixed a few typos. --- 41_snapshots-btrfs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs index d280c30..33bf28e 100755 --- a/41_snapshots-btrfs +++ b/41_snapshots-btrfs @@ -38,7 +38,7 @@ # (Use only if you have custom initramfs name or auto-detect failed.) # # * GRUB_BTRFS_INTEL_UCODE=("intel-ucode.img") # # (Use only if you have custom intel-ucode or auto-detect failed.) # -# * GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("var/lib/docker" "nosapshot") # +# * GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("var/lib/docker" "nosnapshot") # # (Ignore specific path during run "grub-mkconfig") # # * GRUB_BTRFS_CREATE_ONLY_HARMONIZED_ENTRIES="false" # # (Create entries with matching version number instead of all possible combinations of kernel and initramfs) # @@ -374,7 +374,7 @@ list_kernels_initramfs() ### real path to boot boot_dir_real_path="$(make_system_path_relative_to_its_root "$(boot_dir)")" ### Create menu entries - ## name snpashot + ## name snapshot path_snapshot ## title menu custom title_format @@ -396,7 +396,7 @@ list_kernels_initramfs() gettext_printf "###### - Grub-btrfs: Auto-detect Start - ######\n" >&2 ; ### create mount point and mounts [[ ! -d $gbgmp ]] && mkdir -p $gbgmp - mount -o subvolid=0 /dev/disk/by-uuid/$root_uuid $gbgmp/ + mount -o subvolid=5 /dev/disk/by-uuid/$root_uuid $gbgmp/ ### Create a menu in grub echo "submenu '${submenuname}' {" list_kernels_initramfs ; @@ -413,4 +413,4 @@ list_kernels_initramfs() ## unmount mount point umount $gbgmp gettext_printf "###### - Grub-btrfs: Auto-detect End - ######\n" >&2 ; -### End ### \ No newline at end of file +### End ### From bfa42253e076c2b9d3891573011a4f5239282d94 Mon Sep 17 00:00:00 2001 From: Pierre-Alain TORET Date: Fri, 18 Nov 2016 14:23:23 +0100 Subject: [PATCH 2/2] Fix typo --- 41_snapshots-btrfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs index 33bf28e..14abc8b 100755 --- a/41_snapshots-btrfs +++ b/41_snapshots-btrfs @@ -346,7 +346,7 @@ list_kernels_initramfs() [[ "${gbgmp}"/"${snap_dir_name}" == "${gbgmp}"/"${isp}"/* ]] && continue 2; done fi - ### detect if /boot directory exist + ### detect if /boot directory exists [[ ! -d "$gbgmp/$snap_dir_name/boot" ]] && continue; ### show snapshot found during run "grub-mkconfig" snap_date_time=${item[@]:0:2}