Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-norootdelay-cosmic into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Steve Langasek on 2018-10-11
Status: Work in progress
Proposed branch: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-norootdelay-cosmic
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 12 lines (+1/-1)
1 file modified
templates/img-azure-18.10-addin.tmpl (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-norootdelay-cosmic
Reviewer Review Type Date Requested Status
Dan Watkins 2018-10-14 Resubmit on 2018-12-18
Philip Roche 2018-10-11 Approve on 2018-10-14
Review via email: mp+356626@code.launchpad.net

Commit message

Don't set rootdelay on the kernel commandline.

This is interpreted differently by the kernel (== fixed delay) vs. in the
Debian initramfs code (== max time to wait before erroring); so what worked
for raising the timeout for images with initramfs causes a boot delay for
images booting without initramfs.

Since the "fabric issue" that this worked around is lost in the mists of
time (2012), we should just stop setting rootdelay.

To post a comment you must log in.
Philip Roche (philroche) wrote :

+1

I have tested this change using ubuntu-old-fashioned and boot times were not affected.

1min 10.444s
1min 1.984s
1min 2.488s
58.403s
59.143s
58.389s
1min 856ms
1min 9.656s
1min 21.010s
1min 12.514s

review: Approve
Dan Watkins (daniel-thewatkins) wrote :

I'm not convinced (a) that we should make this change in release week, and (b) that we actually need it; the cosmic images aren't going to go out booting without initrds, and we should be focused on landing the Azure-on-Alan work and backporting it instead of maintaining these scripts.

(If we really want to, we could land it in the dd scripts for the hopefully-short period of time before we switch to Alan publication.)

review: Needs Information
Philip Roche (philroche) wrote :

As we have yet to receive any feedback about the minimal image yet and we won't be building minimal images with this template then I am +1 on not merging this this week.

Dan Watkins (daniel-thewatkins) wrote :

Steve, I believe we still want to apply this, right? If so, could you resubmit for disco, please?

review: Resubmit

Unmerged revisions

811. By Steve Langasek on 2018-10-11

Don't set rootdelay on the kernel commandline.

This is interpreted differently by the kernel (== fixed delay) vs. in the
Debian initramfs code (== max time to wait before erroring); so what worked
for raising the timeout for images with initramfs causes a boot delay for
images booting without initramfs.

Since the "fabric issue" that this worked around is lost in the mists of
time (2012), we should just stop setting rootdelay.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-azure-18.10-addin.tmpl'
2--- templates/img-azure-18.10-addin.tmpl 2018-10-11 16:07:30 +0000
3+++ templates/img-azure-18.10-addin.tmpl 2018-10-11 21:50:14 +0000
4@@ -6,7 +6,7 @@
5 ${CLOUD_IMG_STR}
6
7 # Set the default commandline
8-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"
9+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0"
10
11 # Set the grub console type
12 GRUB_TERMINAL=serial

Subscribers

People subscribed via source and target branches

to all changes: