c4bfec4a4c
I think it is good time to update to 2.02 so it can get more testing. Although internal changes are pretty extensive, externally it should be pretty much the same. The main user visible changes are - autogen is not used anymore, so we can finally simplify patches and recreate files during RPM build. So generated files need not be patched and shipped any more. - GRUB_HIDDEN_TIMEOUT is deprecated, we should use GRUB_TIMEOUT_STYLE instead. This will need perl-Bootloader and YaST changes. Old config is still accpepted so nothing should be broken. - native pvgrub2 support for Xen PV guests. - ARM support (32 and 64 bit), although it has rough edges. (forwarded request 212604 from arvidjaar) OBS-URL: https://build.opensuse.org/request/show/212884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=79
47 lines
1.8 KiB
Diff
47 lines
1.8 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(-)
|
|
|
|
Index: grub-2.00/util/grub-mkconfig.in
|
|
===================================================================
|
|
--- grub-2.00.orig/util/grub-mkconfig.in
|
|
+++ grub-2.00/util/grub-mkconfig.in
|
|
@@ -217,7 +217,8 @@ export GRUB_DEFAULT \
|
|
GRUB_ENABLE_CRYPTODISK \
|
|
GRUB_BADRAM \
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
- GRUB_DISABLE_SUBMENU
|
|
+ GRUB_DISABLE_SUBMENU \
|
|
+ GRUB_CMDLINE_LINUX_RECOVERY
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
Index: grub-2.00/util/grub.d/10_linux.in
|
|
===================================================================
|
|
--- grub-2.00.orig/util/grub.d/10_linux.in
|
|
+++ grub-2.00/util/grub.d/10_linux.in
|
|
@@ -244,7 +244,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' ' '`
|