Merge lp:~smoser/vmbuilder/automated-ec2-builds.lp1035279 into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds
Proposed by
Scott Moser
Status: | Merged |
---|---|
Merged at revision: | 499 |
Proposed branch: | lp:~smoser/vmbuilder/automated-ec2-builds.lp1035279 |
Merge into: | lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds |
Diff against target: |
41 lines (+17/-14) 1 file modified
vmbuilder-cloudimg-fixes (+17/-14) |
To merge this branch: | bzr merge lp:~smoser/vmbuilder/automated-ec2-builds.lp1035279 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ben Howard | Pending | ||
Review via email: mp+120410@code.launchpad.net |
Description of the change
set GRUB_RECORDFAIL
Previously, only quantal builds set GRUB_RECORDFAIL
This also combines the setting of GRUB_TIMEOUT into a single location.
Previously, it was updated in one place for natty or later, and
a different location for quantal or later. Instead, we set a variable
and update based on that.
The other change done here is to move the RECORDFAIL and GRUB_TIMEOUT
changes outside of the 'GRUB_HIDDEN_
That block was also protected by 'dist_ge natty'.
To post a comment you must log in.