41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From b29ffe391d012b3a5b2b4d061f14eaea0f9da0ec Mon Sep 17 00:00:00 2001
|
|
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
Date: Fri, 19 Apr 2013 12:08:46 +0400
|
|
Subject: [PATCH 325/482] * util/grub.d/30_os-prober.in: Add onstr to linux
|
|
entries in one more place.
|
|
|
|
---
|
|
ChangeLog | 5 +++++
|
|
util/grub.d/30_os-prober.in | 2 +-
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index f1750b0..7450036 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2013-04-19 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
+
|
|
+ * util/grub.d/30_os-prober.in: Add onstr to linux entries in one
|
|
+ more place.
|
|
+
|
|
2013-04-19 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
Add support for pseries and other bootinfo machines to grub-mkrescue.
|
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
|
index 5500a3c..04f32a1 100644
|
|
--- a/util/grub.d/30_os-prober.in
|
|
+++ b/util/grub.d/30_os-prober.in
|
|
@@ -231,7 +231,7 @@ EOF
|
|
}
|
|
EOF
|
|
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
- replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
+ replacement_title="$(echo "Advanced options for ${OS} $onstr" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
--
|
|
1.8.2.1
|
|
|