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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-01 10:30:39 +0000
3+++ debian/changelog 2012-10-26 14:04:49 +0000
4@@ -1,3 +1,13 @@
5+grub2 (1.99-12ubuntu6) UNRELEASED; urgency=low
6+
7+ [ Ben Howard ]
8+ * Parameterization of recordfail setting. This allows users to define the
9+ default time out of GRUB when recordfail has been set. The current
10+ setting causes hangs on headless and appliances where access to the
11+ console is limited or prohibited. (LP: #669481)
12+
13+ -- Louis Bouchard <louis.bouchard@canonical.com> Tue, 02 Oct 2012 13:50:50 +0200
14+
15 grub2 (1.99-12ubuntu5) oneiric; urgency=low
16
17 * Never use 'set gfxpayload=keep' in recovery mode (LP: #854967).
18
19=== modified file 'debian/patches/ubuntu_failed_boot_menu.patch'
20--- debian/patches/ubuntu_failed_boot_menu.patch 2011-06-21 13:25:48 +0000
21+++ debian/patches/ubuntu_failed_boot_menu.patch 2012-10-26 14:04:49 +0000
22@@ -35,7 +35,7 @@
23 cat << EOF
24 -set timeout=${2}
25 +if [ "\${recordfail}" = 1 ]; then
26-+ set timeout=-1
27++ set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
28 +else
29 + set timeout=${2}
30 +fi
31@@ -56,3 +56,34 @@
32 if ! ${recovery} ; then
33 save_default_entry | sed -e "s/^/\t/"
34 fi
35+Index: b/docs/grub.texi
36+===================================================================
37+--- a/docs/grub.texi
38++++ b/docs/grub.texi
39+@@ -1250,6 +1250,12 @@
40+ Each module will be loaded as early as possible, at the start of
41+ @file{grub.cfg}.
42+
43++@item GRUB_RECORDFAIL_TIMEOUT
44++If this option is set, it overrides the default recordfail setting. The
45++default setting is -1, which causes GRUB to wait for user input. This option
46++should be set on headless and appliance systems where access to a console is
47++restricted or limited.
48++
49+ @end table
50+
51+ For more detailed customisation of @command{grub-mkconfig}'s output, you may
52+Index: b/util/grub-mkconfig.in
53+===================================================================
54+--- a/util/grub-mkconfig.in
55++++ b/util/grub-mkconfig.in
56+@@ -258,7 +258,8 @@
57+ GRUB_DISABLE_OS_PROBER \
58+ GRUB_INIT_TUNE \
59+ GRUB_SAVEDEFAULT \
60+- GRUB_BADRAM
61++ GRUB_BADRAM \
62++ GRUB_RECORDFAIL_TIMEOUT
63+
64+ if test "x${grub_cfg}" != "x"; then
65+ rm -f ${grub_cfg}.new

Subscribers

People subscribed via source and target branches