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

Proposed by Robert C Jennings on 2019-04-25
Status: Merged
Merged at revision: 825
Proposed branch: lp:~rcj/vmbuilder/jenkins_kvm
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 15 lines (+5/-0)
1 file modified
templates/img-update.tmpl (+5/-0)
To merge this branch: bzr merge lp:~rcj/vmbuilder/jenkins_kvm
Reviewer Review Type Date Requested Status
Cody Shepherd 2019-04-25 Approve on 2019-04-25
Francis Ginther 2019-04-25 Approve on 2019-04-25
Review via email: mp+366522@code.launchpad.net

Commit message

builder: Force boot with initramfs on disco

The initramfs-less boot causes a panic on initial boot for disco.
This should send it back to grub to reboot with an initramfs,
but the builder image is invoked with -no-reboot on the kvm command
line so the initramfs-less boot mechanism results in a panic and
no recovery. Rather than change how we launch to remove -no-reboot
this patch alters the grub environment to boot the first time with
an initrd.

Setting the initrdfail=1 grub variable for the builder means
that we boot correctly on the first boot and find the rootfs.

To post a comment you must log in.
Francis Ginther (fginther) :
review: Approve
Robert C Jennings (rcj) wrote :

With this change the disco builder does boot in production and begin image customization.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-update.tmpl'
2--- templates/img-update.tmpl 2019-04-18 22:19:04 +0000
3+++ templates/img-update.tmpl 2019-04-25 15:24:32 +0000
4@@ -296,6 +296,11 @@
5 esac
6 xchroot update-grub
7
8+# Force boot with initramfs on disco
9+if [ "$suite" == "disco" ] ; then
10+ xchroot /usr/bin/grub-editenv /boot/grub/grubenv set initrdfail=1
11+fi
12+
13 # builder requirements
14 [ -e ${mp}/etc/resolvconf/resolv.conf.d/original ] &&
15 rm ${mp}/etc/resolvconf/resolv.conf.d/original

Subscribers

People subscribed via source and target branches