From 3bab68711901912ee1e7eecf5ff400f6c356346a Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Thu, 25 May 2017 20:35:24 -0500
Subject: [PATCH] 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.
---
 debian/changelog                                       | 10 ++++++++++
 .../ubuntu-cpc/hooks/034-disk-image-ppc64el.binary     |  8 +++++++-
 live-build/ubuntu-cpc/hooks/999-extras.binary          |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a82967..c274207d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
   [Daniel Watkins]
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 100644
--- 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
diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary
index dad116a0..ffc7c691 100644
--- 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}"