ubuntu-cpc: Fix ppc64el grub timeout. Also run extras correctly.

* 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.
ubuntu/trusty
Robert C Jennings 8 years ago
parent 009aca99d8
commit 3bab687119

10
debian/changelog vendored

@ -1,3 +1,13 @@
livecd-rootfs (2.209.9) trusty; urgency=medium
[Daniel Watkins]
* 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.
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 23 May 2017 20:57:47 -0500
livecd-rootfs (2.209.8) trusty; urgency=medium livecd-rootfs (2.209.8) trusty; urgency=medium
[Daniel Watkins] [Daniel Watkins]

@ -30,7 +30,13 @@ install_grub() {
mkdir -p mountpoint/etc/default/grub.d mkdir -p mountpoint/etc/default/grub.d
cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
${CLOUD_IMG_STR} ${CLOUD_IMG_STR}
#
# Set the recordfail timeout
GRUB_RECORDFAIL_TIMEOUT=0
# Do not wait on grub prompt
GRUB_TIMEOUT=0
# Set the default commandline # Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk" GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
EOF EOF

@ -12,4 +12,4 @@ fi
. /build/config/functions . /build/config/functions
# Cleaner execution # Cleaner execution
/bin/run-parts ${extra_d} /bin/run-parts --regex ".*\.binary" "${extra_d}"

Loading…
Cancel
Save