95edfcfad6
Please help to review the patch, thanks. (forwarded request 127259 from michael-chang) OBS-URL: https://build.opensuse.org/request/show/127311 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=40
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 6225854682a736e4312ce15b34c90fff03b002db Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Fri, 6 Jul 2012 15:55:18 +0800
|
|
Subject: [PATCH] add GRUB_CMDLINE_LINUX_RECOVERY for recovery mode
|
|
|
|
References: [openSUSE-factory] Has FailSafe or Safe Mode been removed
|
|
permanently from 12.2?
|
|
Patch-Mainline: no
|
|
|
|
We adapt the script a bit in order to support openSUSE's failsafe
|
|
booting mode. We don't use single user mode but with specific kernel
|
|
command line options decided in YaST. These command line could be
|
|
applied to grub2's recovery mode via the new setting
|
|
GRUB_CMDLINE_LINUX_RECOVERY.
|
|
---
|
|
util/grub-mkconfig.in | 3 ++-
|
|
util/grub.d/10_linux.in | 2 +-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index 516be86..f61796f 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -216,7 +216,8 @@ export GRUB_DEFAULT \
|
|
GRUB_INIT_TUNE \
|
|
GRUB_SAVEDEFAULT \
|
|
GRUB_ENABLE_CRYPTODISK \
|
|
- GRUB_BADRAM
|
|
+ GRUB_BADRAM \
|
|
+ GRUB_CMDLINE_LINUX_RECOVERY
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index d856481..e7a180e 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -243,7 +243,7 @@ while [ "x$list" != "x" ] ; do
|
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
linux_entry "${OS}" "${version}" recovery \
|
|
- "single ${GRUB_CMDLINE_LINUX}"
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_RECOVERY}"
|
|
fi
|
|
|
|
list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
|
|
--
|
|
1.7.3.4
|
|
|