fix issue #27

and add "Display name of microcode in menuentry when available"

41_snapshots-btrfs

@@ -38,8 +38,10 @@
 #	(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)				#
 #																		#
 # - Generate grub.cfg (on Archlinux use grub-mkconfig -o /boot/grub/grub.cfg)									#
 #																		#
@@ -49,7 +51,7 @@
 #																		#
 # To do:																	#
 #																		#
-#	* Display name of microcode in menuentry when available											#
+#	* Snapper support ....															#
 #																		#
 #################################################################################################################################################
 
@@ -95,6 +97,8 @@ show_snap_found=${GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND:-"true"}
 show_total_snap_found=${GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND:-"true"}
 ## Ignore specific path during run "grub-mkconfig"
 ignore_specific_path=("${GRUB_BTRFS_IGNORE_SPECIFIC_PATH[@]}")
+## create only entries with harmonized version numbers
+harmonized_entries=${GRUB_BTRFS_CREATE_ONLY_HARMONIZED_ENTRIES:-"false"}
 
 
 ########################
@@ -114,7 +118,7 @@ root_uuid=$(${grub_probe} "/" --target="fs_uuid" 2>/dev/null)
 ## Parameters passed to the kernel
 kernel_parameters="$GRUB_CMDLINE_LINUX $GRUB_CMDLINE_LINUX_DEFAULT"
 ## Mount point location
-gbgmp="/tmp/gbgmp"
+gbgmp=$(mktemp -d)
 ## Class for theme
 CLASS="--class snapshots --class gnu-linux --class gnu --class os"
 ## save IFS
@@ -144,8 +148,14 @@ snapshots_entry()
 	for k in "${name_kernel[@]}"; do
 		for i in "${name_initramfs[@]}"; do
 			for u in "${name_microcode[@]}"; do
+			if [ -f "$(boot_dir)"/"${u}" ] ; then
+				echo "\
+		menuentry '"${k}" & "${i}" & "${u}"' ${CLASS} "\$menuentry_id_option" 'gnulinux-snapshots-$boot_uuid'{"
+			else 
+				echo "\
+		menuentry '"${k}" & "${i}"' ${CLASS} "\$menuentry_id_option" 'gnulinux-snapshots-$boot_uuid'{"
+			fi
 			echo "\
-		menuentry '"${k}" & "${i}"' ${CLASS} "\$menuentry_id_option" 'gnulinux-snapshots-$boot_uuid'{
 			$(save_default_entry)
 			if [ x\$feature_all_video_module = xy ]; then
 				insmod all_video
@@ -159,8 +169,7 @@ snapshots_entry()
 			fi
 			echo 'Loading Snapshot: "${snap_date_time}" "${snap_dir_name}"'
 			echo 'Loading Kernel: "${k}" ...'
-			linux \"${boot_dir_real_path}/"${k}"\" root=UUID=${root_uuid} rw rootflags=subvol=\""${snap_dir_name}"\" ${kernel_parameters}\
-			"
+			linux \"${boot_dir_real_path}/"${k}"\" root=UUID=${root_uuid} rw rootflags=subvol=\""${snap_dir_name}"\" ${kernel_parameters}"
 			if [ -f "$(boot_dir)"/"${u}" ] ; then
 				echo "\
 			echo 'Loading Microcode & Initramfs: "${u}" "${i}" ...'
@@ -177,6 +186,62 @@ snapshots_entry()
 	echo "	}"
 }
 
+harmonized_snapshots_entry()
+{
+## \" required for snap,kernels,init,microcode with space in their name
+	echo "	submenu '"${title_menu[*]}"' {
+		submenu '---> "${title_menu[*]}" <---' { echo }
+	"
+	for k in "${name_kernel[@]}"; do
+		version=${k#vmlinuz-}
+		i=""
+		if [ -f "$(boot_dir)"/initramfs-"${version}".img ]; then
+			i=initramfs-${version}.img
+		else
+			if [ -f "$(boot_dir)"/initrd.img-"${version}" ]; then
+				i=initrd.img-${version}
+			fi
+		fi
+		for u in "${name_microcode[@]}"; do
+			if [ -f "$(boot_dir)"/"${u}" ] ; then
+				echo "\
+		menuentry '"${k}" & "${i}" & "${u}"' ${CLASS} "\$menuentry_id_option" 'gnulinux-snapshots-$boot_uuid'{"
+			else 
+				echo "\
+		menuentry '"${k}" & "${i}"' ${CLASS} "\$menuentry_id_option" 'gnulinux-snapshots-$boot_uuid'{"
+			fi
+			echo "\
+			$(save_default_entry)
+			if [ x\$feature_all_video_module = xy ]; then
+				insmod all_video
+			fi
+			set gfxpayload=keep
+			insmod ${boot_fs}
+			if [ x\$feature_platform_search_hint = xy ]; then
+				search --no-floppy --fs-uuid  --set=root ${hs_boot} ${boot_uuid}
+			else
+				search --no-floppy --fs-uuid  --set=root ${boot_uuid}
+			fi
+			echo 'Loading Snapshot: "${snap_date_time}" "${snap_dir_name}"'
+			echo 'Loading Kernel: "${k}" ...'
+			linux \"${boot_dir_real_path}/"${k}"\" root=UUID=${root_uuid} rw rootflags=subvol=\""${snap_dir_name}"\" ${kernel_parameters}"
+			if [ -f "$(boot_dir)"/"${i}" ] ; then
+				if [ -f "$(boot_dir)"/"${u}" ] ; then
+					echo "\
+			echo 'Loading Microcode & Initramfs: "${u}" "${i}" ...'
+			initrd \"${boot_dir_real_path}/"${u}"\" \"${boot_dir_real_path}/"${i}"\""
+				else
+					echo "\
+			echo 'Loading Initramfs: "${i}" ...'
+			initrd \"${boot_dir_real_path}/"${i}"\""
+				fi
+			fi
+			echo "		}"
+		done
+	done
+	echo "	}"
+}
+
 ## List of snapshots on filesystem
 snapshot_list()
 {
@@ -285,7 +350,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}
@@ -297,11 +362,13 @@ list_kernels_initramfs()
 		detect_kernel
 		name_kernel=("${list_kernel[@]##*"/"}")
 		# echo "kernel = ${name_kernel[*]}"
-		### Initramfs (autodetect + custom initramfs)
-		unset list_initramfs
-		detect_initramfs
-		name_initramfs=("${list_initramfs[@]##*"/"}")
-		# echo "initramfs = ${name_initramfs[*]}"
+		if [[ "${harmonized_entries}" != "true" ]]; then
+			### Initramfs (autodetect + custom initramfs)
+			unset list_initramfs
+			detect_initramfs
+			name_initramfs=("${list_initramfs[@]##*"/"}")
+			# echo "initramfs = ${name_initramfs[*]}"
+		fi
 		### microcode (auto-detect + custom microcode)
 		unset list_ucode
 		detect_microcode
@@ -310,12 +377,16 @@ 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
 		# echo "${title_menu[*]}"
-		snapshots_entry
+		if [[ "${harmonized_entries}" = "false" ]]; then
+			snapshots_entry
+		else
+			harmonized_snapshots_entry
+		fi
 		### Limit snapshots found during run "grub-mkconfig"
 	        count_limit_snap=$((1+$count_limit_snap))
 	        [[ $count_limit_snap -ge $limit_snap_show ]] && break;
@@ -328,7 +399,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 ;
@@ -345,4 +416,4 @@ list_kernels_initramfs()
 	## unmount mount point
 	umount $gbgmp
 	gettext_printf "###### - Grub-btrfs: Auto-detect End   - ######\n" >&2 ;
-### End ###
+### End ###

README.md

@@ -2,7 +2,6 @@
   
 ### grub-btrfs
 
-
 This is a version 1.xx of grub-btrfs
 
 #### Description
@@ -76,6 +75,9 @@ Add this lines to /etc/default/grub:
 
 	(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)
 
 
 
@@ -88,7 +90,7 @@ You will see it appear differents entries (e.g : Snapshot: [2014-02-12 11:24:37]
 
 #### TO DO
 
-* Display name of microcode in menuentry when available
+* Snapper support
 
 
 ## discussion