"single" -> "recovery" when friendly-recovery is installed

If configured with --enable-ubuntu-recovery, also set nomodeset for
recovery mode, and disable 'set gfxpayload=keep' even if the system
normally supports it.  See
https://launchpad.net/ubuntu/+spec/desktop-o-xorg-tools-and-processes.

Author: Stéphane Graber <stgraber@ubuntu.com>
Forwarded: no
Last-Update: 2013-12-25

Patch-Name: mkconfig-ubuntu-recovery.patch

Gbp-Pq: Name mkconfig-ubuntu-recovery.patch

diff --git a/configure.ac b/configure.ac
index cd667a2eb75aa28a8e8e599b2a0a2f261154835a..f19356ee3f9abbff5a95e8d3945b50632b7d6bad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2057,6 +2057,17 @@ fi
 AC_SUBST([LIBZFS])
 AC_SUBST([LIBNVPAIR])
 
+AC_ARG_ENABLE([ubuntu-recovery],
+              [AS_HELP_STRING([--enable-ubuntu-recovery],
+                              [adjust boot options for the Ubuntu recovery mode (default=no)])],
+              [], [enable_ubuntu_recovery=no])
+if test x"$enable_ubuntu_recovery" = xyes ; then
+  UBUNTU_RECOVERY=1
+else
+  UBUNTU_RECOVERY=0
+fi
+AC_SUBST([UBUNTU_RECOVERY])
+
 LIBS=""
 
 AC_SUBST([FONT_SOURCE])

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index cc6ae58e57fa4d01b993a076a57ff6d76a7d2889..858052c80bc88058f8e3a463743520ae08b00a03 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -20,6 +20,7 @@ set -e
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
+ubuntu_recovery="@UBUNTU_RECOVERY@"
 
 . "$pkgdatadir/grub-mkconfig_lib"
 
@@ -48,7 +49,11 @@ case ${GRUB_DEVICE} in
   ;;
 esac
 
-: ${GRUB_CMDLINE_LINUX_RECOVERY:=single}
+if [ -x /lib/recovery-mode/recovery-menu ]; then
+    : ${GRUB_CMDLINE_LINUX_RECOVERY:=recovery}
+else
+    : ${GRUB_CMDLINE_LINUX_RECOVERY:=single}
+fi
 
 # Default to disabling partition uuid support to maintian compatibility with
 # older kernels.
@@ -86,6 +91,10 @@ esac
 
 title_correction_code=
 
+if [ "$ubuntu_recovery" = 1 ]; then
+    GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY nomodeset"
+fi
+
 linux_entry ()
 {
   os="$1"
@@ -125,7 +134,9 @@ linux_entry ()
       if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
          echo "        load_video" | sed "s/^/$submenu_indentation/"
       fi
-      echo "   set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
+      if [ "$ubuntu_recovery" = 0 ] || [ x$type != xrecovery ]; then
+         echo "        set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
+      fi
   fi
 
   echo "       insmod gzio" | sed "s/^/$submenu_indentation/"

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 656301eaf22407924deb1f719ef17a4023058273..b74606b0b310b951562c8dae1d2616f370e764e2 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -227,7 +227,7 @@ EOF
        fi
 
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
-       recovery_params="$(echo "${LPARAMS}" | grep single)" || true
+       recovery_params="$(echo "${LPARAMS}" | grep 'single\|recovery')" || true
        counter=1
        while echo "$used_osprober_linux_ids" | grep 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id' > /dev/null; do
            counter=$((counter+1));