Attachment 18809 Details for Bug 54130 – Патч grub-entries (версия 2)

[patch] Патч grub-entries (версия 2)

0001-grub-entries-Implement-default-next-boot-markers-wit.patch (text/plain), 5.24 KB, created by Vasiliy Kovalev on 2025-06-09 14:26:58 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Vasiliy Kovalev

Created: 2025-06-09 14:26:58 MSK

Size: 5.24 KB

patch

obsolete

>From a968cd5a7afcb2cff259fd88ed5f09b50e9b0f04 Mon Sep 17 00:00:00 2001
>From: Vasiliy Kovalev <kovalev@altlinux.org>
>Date: Wed, 4 Jun 2025 13:25:37 +0300
>Subject: [PATCH v2] grub-entries: Implement default/next boot markers with
> ID/title matching
>
>Enhances grub-entries to display visual indicators for:
>- Default boot entry (set via grub-set-default)
>- Next boot entry (set via grub-reboot)
>
>Key improvements:
>1. Added grubenv parsing for saved_entry and next_entry values
>2. Implemented dual matching mechanism for both:
>   - GRUB menu IDs (e.g., 'gnulinux-advanced-...>gnulinux-...')
>   - Human-readable titles (e.g., 'ALT Workstation K 11.0')
>3. Introduced ID extraction function
>4. Added ID path tracking for nested submenu entries
>5. Implemented marker display logic:
>   - '*' for default boot entry
>   - 'N' for next boot entry
>   - Combined '*N' when both apply to same entry
>
>Example outputs:
>0     *   ALT Workstation K 11.0
>1>0       Advanced options...>vmlinuz
>1>3   *N  Advanced options...>6.15.0-alt1
>3     N   Memtest86+-7.20
>
>Closes: https://bugzilla.altlinux.org/54130
>Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>
>---
>v2: Optimize script for performance (~x2):
>- Replace multiple external commands with a single sed call for reading grubenv
>- Use shell's case statement instead of grep for faster string matching
>- Simplify conditional logic for setting markers
>---
> altlinux/grub-entries | 110 ++++++++++++++++++++++++++++++++++--------
> 1 file changed, 91 insertions(+), 19 deletions(-)
>
>diff --git a/altlinux/grub-entries b/altlinux/grub-entries
>index 30103150d..c262db959 100755
>--- a/altlinux/grub-entries
>+++ b/altlinux/grub-entries
>@@ -67,47 +67,119 @@ parse_args() {
> 	[ $# -eq 0 ] || show_usage "Unrecognized arguments: '$*'"
> }
> 
>+get_menu_id() {
>+	echo "$1" | sed -ne "
>+		s/.*menuentry_id_option\s\+'$[^']*$'.*/\1/p;
>+		t;
>+		s/.*menuentry_id_option\s\+\"$[^\"]*$\".*/\1/p;
>+	"
>+}
>+
> show_menu() {
> 	local mode= title= number= prefix= entry=0 itemno=0
>+	local grubenv_file= saved_entry= next_entry= mark=
>+	local id_prefix= full_id= full_title= id= line=
>+
>+	# Get current GRUB settings
>+	grubenv_file="${grubmenu%/*}/grubenv"
>+	if [ -f "$grubenv_file" ]; then
>+		saved_entry=$(sed -n 's/^saved_entry=//p' "$grubenv_file")
>+		next_entry=$(sed -n 's/^next_entry=//p' "$grubenv_file")
>+	fi
>+
>+	# Process GRUB menu
>+	sed -n -re '/^\s*(menuentry\s+|submenu\s+|})/p' "$grubmenu" |
>+	while IFS= read -r line; do
>+		# Determine entry type
>+		case "$line" in
>+		*"menuentry "*)	mode="M"
>+			title=$(echo "$line" | sed -re "
>+				s/^\s*menuentry\s+'(([^']|\\\\')+)'.*/\1/;
>+				t;
>+				s/^\s*menuentry\s+\"(([^\"]|\\\\\")+)\".*/\1/;
>+			")
>+			id=$(get_menu_id "$line")
>+			full_title="${prefix}${title}"
>+			;;
>+		*"submenu "*)	mode="S"
>+			title=$(echo "$line" | sed -re "
>+				s/^\s*submenu\s+'(([^']|\\\\')+)'.*/\1/;
>+				t;
>+				s/^\s*submenu\s+\"(([^\"]|\\\\\")+)\".*/\1/;
>+			")
>+			id=$(get_menu_id "$line")
>+			full_title="${prefix}${title}"
>+			;;
>+		*"}"*)		mode="E" ;;
>+		*)		mode="" ;;
>+		esac
> 
>-	cat "$grubmenu" | sed \
>-		-re '/^\s*(menuentry\s+|submenu\s+|})/!d' \
>-		-re "s/^\s*menuentry\s+'([^']+)'.*\$/M\t\1/g" \
>-		-re 's/^\s*menuentry\s+"([^"]+)".*$/M\t\1/g' \
>-		-re "s/^\s*submenu\s+'([^']+)'.*\$/S\t\1/g" \
>-		-re 's/^\s*submenu\s+"([^"]+)".*$/S\t\1/g' \
>-		-re "s/^\s*}\s*\$/E\t-/g" |
>-	while read mode title; do
> 		case "$mode" in
>-		M)	if [ $numbers_only -ne 0 ]; then
>-				echo -e "${number}${itemno}"
>+		M)	# Menu entry
>+			# Build full ID path
>+			if [ -n "$id_prefix" ]; then
>+				full_id="${id_prefix}>${id}"
>+			else
>+				full_id="$id"
>+			fi
>+
>+			# Set markers based on both ID and title
>+			mark=""
>+			[ -n "$saved_entry" ] && [ "$full_id" = "$saved_entry" ] ||
>+						 [ "$full_title" = "$saved_entry" ] && mark="*"
>+			[ -n "$next_entry" ]  && [ "$full_id" = "$next_entry" ]  ||
>+						 [ "$full_title" = "$next_entry" ]  && mark="${mark}N"
>+			mark=$(printf '%-3s' "$mark")
>+
>+			# Format output with proper alignment
>+			if [ $numbers_only -ne 0 ]; then
>+				echo "${number}${itemno}"
> 			elif [ $titles_only -ne 0 ]; then
>-				echo -e "${prefix}${title}"
>+				echo "${full_title}"
> 			else
>-				echo -e "${number}${itemno}\t${prefix}${title}"
>+				printf "%-6s%-4s%s\n" "${number}${itemno}" "$mark" "$full_title"
> 			fi
>-			itemno=$(($itemno + 1))
>+
>+			itemno=$((itemno + 1))
> 			entry=1
> 			;;
>-		S)	number="${number}${itemno}>"
>+
>+		S)	# Submenu entry
>+			# Update ID prefix
>+			if [ -n "$id_prefix" ]; then
>+				id_prefix="${id_prefix}>${id}"
>+			else
>+				id_prefix="$id"
>+			fi
>+
>+			# Update numbering
>+			number="${number}${itemno}>"
> 			prefix="${prefix}${title}>"
> 			itemno=0
> 			;;
>-		*)	if [ $entry -ne 0 ]; then
>+
>+		E)	# End of menu
>+			if [ $entry -ne 0 ]; then
> 				entry=0
> 			elif [ -n "$number" ]; then
>+				# Handle menu closure
> 				number="${number%>}"
> 				prefix="${prefix%>}"
>+				id_prefix="${id_prefix%>*}"
>+
> 				case "$number" in
>-				*">"*)	itemno="${number##*>}"
>+				*">"*)	# Submenu closed
>+					itemno="${number##*>}"
> 					number="${number%>*}>"
> 					prefix="${prefix%>*}>"
>-					itemno=$(($itemno + 1))
>+					itemno=$((itemno + 1))
> 					;;
>-				*)	itemno=$number
>-					itemno=$(($itemno + 1))
>+				*)	# Top-level closed
>+					itemno=$number
>+					itemno=$((itemno + 1))
> 					prefix=
> 					number=
>+					id_prefix=
> 					;;
> 				esac
> 			fi
>-- 
>2.42.2
>

Actions: View | Diff

Attachments on bug 54130: 18750 | 18809