From e3d6d5dc9f642a5679ccfb133277c59dbc6b9fe5 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 28 Jan 2016 09:34:52 +0000 Subject: [PATCH 1/2] Set timeout options so ppc64el cloud images don't display a grub boot menu (matching the behaviour of other cloud images). --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 From 414cbec4dcb9ace8b9dfb1acf3be8f4a47c082ff Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 28 Jan 2016 10:07:33 +0000 Subject: [PATCH 2/2] Specify a regex to run-parts so that cloud image extra scripts are found and executed. --- debian/changelog | 2 ++ live-build/ubuntu-cpc/hooks/999-extras.binary | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index de5fdf11..7ba3ab2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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). + * Specify a regex to run-parts so that cloud image extra scripts are found + and executed. -- Daniel Watkins Thu, 28 Jan 2016 09:32:36 +0000 diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary index dad116a0..ffc7c691 100755 --- a/live-build/ubuntu-cpc/hooks/999-extras.binary +++ b/live-build/ubuntu-cpc/hooks/999-extras.binary @@ -12,4 +12,4 @@ fi . /build/config/functions # Cleaner execution -/bin/run-parts ${extra_d} +/bin/run-parts --regex ".*\.binary" "${extra_d}"