Merge lp:~daniel-thewatkins/livecd-rootfs/ppc64el into lp:livecd-rootfs

[Dan Watkins]

[lp:~daniel-thewatkins/livecd-rootfs/ppc64el]

1269. By Dan Watkins on 2016-01-28

Specify a regex to run-parts so that cloud image extra scripts are found
and executed.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-27 16:33:28 +0000
+++ debian/changelog	2016-01-28 10:07:42 +0000
@@ -1,3 +1,12 @@
+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 <[e-mail]>  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)

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2016-01-27 15:49:05 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2016-01-28 10:07:42 +0000
@@ -30,7 +30,13 @@
     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

=== modified file 'live-build/ubuntu-cpc/hooks/999-extras.binary'
--- live-build/ubuntu-cpc/hooks/999-extras.binary	2016-01-19 02:58:50 +0000
+++ live-build/ubuntu-cpc/hooks/999-extras.binary	2016-01-28 10:07:42 +0000
@@ -12,4 +12,4 @@
 . /build/config/functions
 
 # Cleaner execution
-/bin/run-parts ${extra_d}
+/bin/run-parts --regex ".*\.binary" "${extra_d}"