Merge lp:~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/param-recordfail-timeout into lp:ubuntu/quantal/grub2

[Ben Howard]

Parameterization of recordfail setting. This allows users to define the
default time out of Grub2 when recordfail has been set. The current
setting causes hangs on appliances and Cloud Images where access to the
console is limited or prohibited. (LP: #669481)

This patch parameterizes the record fail behavior, such that putting "GRUB_RECORDFAIL_TIMEOUT=0" in /etc/default/grub will fix hang problems on appliances and HVM cloud images. (See LP: #462888, #872244, #447725 and #669481 and there are many user reports on Google). The current work-around is to modify /etc/grub.d/00_header directly. However, this work around fails on any Grub2 package update.

This fix simply adds the environment variable "GRUB_RECORDFAIL_TIMEOUT" which can then be defined in /etc/default/grub. When this variable is present, it sets the timeout on "recordfail" to the value, otherwise it sets it the default value of "-1".

This has been tested on both Precise and Quantal builds.

[lp:~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/param-recordfail-timeout]

144. By Ben Howard on 2012-05-22

Changed the changelong to be more descriptive of the change

[Colin Watson (cjwatson)]

Please drop the debian/default/grub change. It'll probably cause configuration file prompts for people, and it's unnecessary - most variables are not documented by way of comments in the stock /etc/default/grub file.

Conversely, please add a patch to docs/grub.texi to document this new variable.

review: Needs Fixing

[Colin Watson (cjwatson)]

Oh, also, a more verbose changelog entry (along the lines of your commit message) wouldn't hurt.

[lp:~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/param-recordfail-timeout]

145. By Ben Howard on 2012-05-24

Parameterization of recordfail setting. This allows users to define the
default time out of GRUB when recordfail has been set. The current
setting causes hangs on headless and appliances where access to the
console is limited or prohibited. (LP: #669481)

Unmerged revisions

145. By Ben Howard on 2012-05-24

Parameterization of recordfail setting. This allows users to define the
default time out of GRUB when recordfail has been set. The current
setting causes hangs on headless and appliances where access to the
console is limited or prohibited. (LP: #669481)

144. By Ben Howard on 2012-05-22

Changed the changelong to be more descriptive of the change

143. By Ben Howard on 2012-05-18

Parameterization of recordfail timeout (LP: #669481)

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-15 08:03:30 +0000
+++ debian/changelog	2012-05-21 23:42:21 +0000
@@ -1,3 +1,9 @@
+grub2 (1.99-21ubuntu5) quantal; urgency=low
+
+  * Parameterization of recordfail setting. (LP: #669481)
+
+ -- Ben Howard <[e-mail]>  Fri, 18 May 2012 11:22:57 -0600
+
 grub2 (1.99-21ubuntu4) quantal; urgency=low
 
   * Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464)

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-17 16:11:45 +0000
+++ debian/patches/series	2012-05-21 23:42:21 +0000
@@ -64,3 +64,4 @@
 ubuntu_qemu_no_kvm.patch
 ubuntu_probe_nonexistent_loopback.patch
 ubuntu_efi_device_discovery.patch
+ubuntu_param_recordfail_timeout.patch

=== added file 'debian/patches/ubuntu_param_recordfail_timeout.patch'
--- debian/patches/ubuntu_param_recordfail_timeout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_param_recordfail_timeout.patch	2012-05-21 23:42:21 +0000
@@ -0,0 +1,46 @@
+Description: Parameterizes the timeout value for recordfail boots
+Author: Ben Howard <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/669481
+Forwarded: no
+Last-Update: 2012-05-17
+
+Index: b/debian/default/grub
+===================================================================
+--- a/debian/default/grub
++++ b/debian/default/grub
+@@ -32,3 +32,8 @@ GRUB_CMDLINE_LINUX=""
+ 
+ # Uncomment to get a beep at grub start
+ #GRUB_INIT_TUNE="480 440 1"
++
++# Uncomment to disable record fail timeout
++# This should be uncommented on appliances and cloud images. Default value is
++# "-1", which causes Grub to wait for user input if a previous boot fails.
++#GRUB_RECORDFAIL_TIMEOUT=0
+Index: b/util/grub.d/00_header.in
+===================================================================
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -233,7 +233,7 @@ make_timeout ()
+ {
+     cat << EOF
+ if [ "\${recordfail}" = 1 ]; then
+-  set timeout=-1
++  set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
+ else
+   set timeout=${2}
+ fi
+Index: b/util/grub-mkconfig.in
+===================================================================
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -245,7 +245,8 @@ export GRUB_DEFAULT \
+   GRUB_DISABLE_OS_PROBER \
+   GRUB_INIT_TUNE \
+   GRUB_SAVEDEFAULT \
+-  GRUB_BADRAM
++  GRUB_BADRAM \
++  GRUB_RECORDFAIL_TIMEOUT
+ 
+ if test "x${grub_cfg}" != "x"; then
+   rm -f ${grub_cfg}.new