← Back to branch summary

~hamo/ubuntu/precise/grub2/grub2.hi_res

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_recovery_nosingle.patch

  • Committer: Package Import Robot
  • Author(s): Colin Watson, Andy Whitcroft, Colin Watson
  • Date: 2012-04-05 13:36:57 UTC
  • Revision ID: package-import@ubuntu.com-20120405133657-e3n4143scpe0si6h
Tags: 1.99-21ubuntu2
https://launchpad.net/bugs/942846
https://launchpad.net/bugs/938724
[ Andy Whitcroft ]
* Only supply vt.handoff=7 when we are using gfxpayload=keep.  Do this
  even when the command line is modified before execution.  (LP: #942846)

[ Colin Watson ]
* Don't crash on inaccessible loop device backing paths (LP: #938724).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_recovery_nosingle.patch
7
7
===================================================================
8
8
--- a/util/grub.d/10_linux.in
9
9
+++ b/util/grub.d/10_linux.in
10
 
@@ -232,8 +232,13 @@
 
10
@@ -243,8 +243,13 @@
11
11
       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}" \
12
12
       quiet
13
13
   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then