Hello community, here is the log from the commit of package grub2 for openSUSE:12.2 checked in at 2012-07-09 07:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/grub2 (Old) and /work/SRC/openSUSE:12.2/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/grub2/grub2.changes 2012-07-04 22:13:04.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.grub2.new/grub2.changes 2012-07-09 07:58:55.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 6 08:09:16 UTC 2012 - [email protected] + +- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch. We + don't run in sigle user mode for recovery, instead use different + set kernel command line options which could be specified by this + GRUB_CMDLINE_LINUX_RECOVERY setting. + +------------------------------------------------------------------- New: ---- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.Wt7Lxe/_old 2012-07-09 07:58:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Wt7Lxe/_new 2012-07-09 07:58:55.000000000 +0200 @@ -84,6 +84,7 @@ Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch Patch8: grub2-ppc-terminfo.patch +Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch Patch99: use-grub2-efi-as-a-package-name.patch PreReq: perl-Bootloader Requires: gettext-runtime @@ -140,6 +141,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 cd .. # README.openSUSE ++++++ grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch ++++++ >From 6225854682a736e4312ce15b34c90fff03b002db Mon Sep 17 00:00:00 2001 From: Michael Chang <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
