Merge lp:~louis/ubuntu/oneiric/grub2/grub2-lp669481-oneiric into lp:ubuntu/oneiric/grub2

Proposed by Louis Bouchard on 2012-10-26
Status: Merged
Merge reported by: Louis Bouchard
Merged at revision: not available
Proposed branch: lp:~louis/ubuntu/oneiric/grub2/grub2-lp669481-oneiric
Merge into: lp:ubuntu/oneiric/grub2
Diff against target: 65 lines (+42/-1)
2 files modified
debian/changelog (+10/-0)
debian/patches/ubuntu_failed_boot_menu.patch (+32/-1)
To merge this branch: bzr merge lp:~louis/ubuntu/oneiric/grub2/grub2-lp669481-oneiric
Reviewer Review Type Date Requested Status
Scott Moser Approve on 2012-11-06
Ubuntu branches 2012-10-26 Pending
Review via email: mp+131625@code.launchpad.net

Description of the change

This is the same backport as the one applied to Precise and now in precise-update

To post a comment you must log in.
Scott Moser (smoser) wrote :

I've just uploaded this as 'grub2_1.99-12ubuntu5.1' (note, the version is different than you had suggested as 12ubuntu6).

And also made the corresponding change in the build scripts at https://bugs.launchpad.net/ubuntu/oneiric/+bug/1035279

Scott Moser (smoser) wrote :

This is uploaded, but not pushed to lp:ubuntu/oneiric-proposed/grub2.
This merge is "Merged", but I cannot change it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-10-01 10:30:39 +0000
+++ debian/changelog 2012-10-26 14:04:49 +0000
@@ -1,3 +1,13 @@
1grub2 (1.99-12ubuntu6) UNRELEASED; urgency=low
2
3 [ Ben Howard ]
4 * Parameterization of recordfail setting. This allows users to define the
5 default time out of GRUB when recordfail has been set. The current
6 setting causes hangs on headless and appliances where access to the
7 console is limited or prohibited. (LP: #669481)
8
9 -- Louis Bouchard <louis.bouchard@canonical.com> Tue, 02 Oct 2012 13:50:50 +0200
10
1grub2 (1.99-12ubuntu5) oneiric; urgency=low11grub2 (1.99-12ubuntu5) oneiric; urgency=low
212
3 * Never use 'set gfxpayload=keep' in recovery mode (LP: #854967).13 * Never use 'set gfxpayload=keep' in recovery mode (LP: #854967).
414
=== modified file 'debian/patches/ubuntu_failed_boot_menu.patch'
--- debian/patches/ubuntu_failed_boot_menu.patch 2011-06-21 13:25:48 +0000
+++ debian/patches/ubuntu_failed_boot_menu.patch 2012-10-26 14:04:49 +0000
@@ -35,7 +35,7 @@
35 cat << EOF35 cat << EOF
36-set timeout=${2}36-set timeout=${2}
37+if [ "\${recordfail}" = 1 ]; then37+if [ "\${recordfail}" = 1 ]; then
38+ set timeout=-138+ set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
39+else39+else
40+ set timeout=${2}40+ set timeout=${2}
41+fi41+fi
@@ -56,3 +56,34 @@
56 if ! ${recovery} ; then56 if ! ${recovery} ; then
57 save_default_entry | sed -e "s/^/\t/"57 save_default_entry | sed -e "s/^/\t/"
58 fi58 fi
59Index: b/docs/grub.texi
60===================================================================
61--- a/docs/grub.texi
62+++ b/docs/grub.texi
63@@ -1250,6 +1250,12 @@
64 Each module will be loaded as early as possible, at the start of
65 @file{grub.cfg}.
66
67+@item GRUB_RECORDFAIL_TIMEOUT
68+If this option is set, it overrides the default recordfail setting. The
69+default setting is -1, which causes GRUB to wait for user input. This option
70+should be set on headless and appliance systems where access to a console is
71+restricted or limited.
72+
73 @end table
74
75 For more detailed customisation of @command{grub-mkconfig}'s output, you may
76Index: b/util/grub-mkconfig.in
77===================================================================
78--- a/util/grub-mkconfig.in
79+++ b/util/grub-mkconfig.in
80@@ -258,7 +258,8 @@
81 GRUB_DISABLE_OS_PROBER \
82 GRUB_INIT_TUNE \
83 GRUB_SAVEDEFAULT \
84- GRUB_BADRAM
85+ GRUB_BADRAM \
86+ GRUB_RECORDFAIL_TIMEOUT
87
88 if test "x${grub_cfg}" != "x"; then
89 rm -f ${grub_cfg}.new

Subscribers

People subscribed via source and target branches