diff --git a/debian/changelog b/debian/changelog index db3036a0..de5fdf11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.373) UNRELEASED; urgency=medium + + * Set timeout options so ppc64el cloud images don't display a grub boot + menu (matching the behaviour of other cloud images). + + -- Daniel Watkins Thu, 28 Jan 2016 09:32:36 +0000 + livecd-rootfs (2.372) xenial; urgency=medium * Install grub in ppc64el cloud images so they are bootable (LP: #1538610) diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index 54d1ad03..59ae62b6 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -30,7 +30,13 @@ install_grub() { mkdir -p mountpoint/etc/default/grub.d cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg ${CLOUD_IMG_STR} -# + +# Set the recordfail timeout +GRUB_RECORDFAIL_TIMEOUT=0 + +# Do not wait on grub prompt +GRUB_TIMEOUT=0 + # Set the default commandline GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk" EOF