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

[Dan Watkins]

[Dan Watkins (daniel-thewatkins)]

This needs an additional tweak; working on it now.

[Colin Watson (cjwatson)]

review: Approve

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

1266. By Colin Watson on 2016-01-27

[r=cjwatson] Install grub in ppc64el cloud images so they are bootable (LP: #1538610)

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-19 12:50:45 +0000
+++ debian/changelog	2016-01-27 16:29:31 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (2.372) UNRELEASED; urgency=medium
+
+  * Install grub in ppc64el cloud images so they are bootable (LP: #1538610)
+
+ -- Daniel Watkins <[e-mail]>  Wed, 27 Jan 2016 15:47:39 +0000
+
 livecd-rootfs (2.371) xenial; urgency=medium
 
   * Remove unneeded packages from the root.tar.{gz,xz} cloud image targets

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2015-11-06 09:54:59 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2016-01-27 16:29:31 +0000
@@ -40,6 +40,11 @@
         --boot-directory=/boot \
         --target=powerpc-ieee1275
 
+    chroot mountpoint dpkg-divert --local --rename /etc/grub.d/30_os-prober
+    chroot mountpoint update-grub
+    sed -i "s,root=.* ,root=LABEL=cloudimg-rootfs ,g" mountpoint/boot/grub/grub.cfg
+    chroot mountpoint dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober
+
     umount_partition mountpoint
     rmdir mountpoint
 }