← Back to branch summary

~ubuntu-core-dev/ubuntu/oneiric/grub2/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_recovery_nosingle.patch

  • Committer: Stéphane Graber
  • Date: 2011-09-15 21:02:07 UTC
  • Revision ID: stgraber@ubuntu.com-20110915210207-rvwyttu3uaoowiy2
Use recovery instead of single when friendly-recovery is installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_recovery_nosingle.patch
 
1
Description: Replace single by recovery to trigger friendly-recovery
 
2
Author: Stéphane Graber <stgraber@ubuntu.com>
 
3
Forwarded: no
 
4
Last-Update: 2011-09-13
 
5
 
 
6
Index: b/util/grub.d/10_linux.in
 
7
===================================================================
 
8
--- a/util/grub.d/10_linux.in
 
9
+++ b/util/grub.d/10_linux.in
 
10
@@ -232,8 +232,13 @@
 
11
       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}" \
 
12
       quiet
 
13
   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
 
14
-    linux_entry "${OS}" "${version}" true \
 
15
-       "single nomodeset ${GRUB_CMDLINE_LINUX}"
 
16
+    if [ -x /lib/recovery-mode/recovery-menu ]; then
 
17
+      linux_entry "${OS}" "${version}" true \
 
18
+        "recovery nomodeset ${GRUB_CMDLINE_LINUX}"
 
19
+    else
 
20
+      linux_entry "${OS}" "${version}" true \
 
21
+        "single nomodeset ${GRUB_CMDLINE_LINUX}"
 
22
+    fi
 
23
   fi
 
24
 
 
25
   list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
 
26