Merge lp:~rbalint/livecd-rootfs/minimize-fix-grub into lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed

[Balint Reczey]

Fix grub config before releasing 2.408.19

[Balint Reczey (rbalint)]

I'm boot-testing the fix, hence the WIP.

[Steve Langasek (vorlon)]

A grep for suspicious strings also turns up this entry in live-build/ubuntu-cpc/hooks/030-root-tarball.binary (xenial only):

chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe

However this is being done while /removing/ kernel packages + grub, so I think this can be ignored.

+1, this all looks correct, just awaiting the results of your boot test.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-10-04 18:43:52 +0000
+++ debian/changelog	2017-10-05 14:40:41 +0000
@@ -32,6 +32,11 @@
     - If we're using SUBPROJECT=minimized, and tzdata is not installed,
       remove files that have been left behind.  This is a workaround for a
       bug that should be fixed in tzdata.
+  * Factor out grub-related diversions and use them consistently, so we
+    don't end up with wrong os-probe output in our grub.cfg.
+  * Fix the force-partuuid handling to create the file under
+    /etc/default/grub.d/ with a .cfg extension as grub expects; it's unclear
+    how this ever worked without.
 
   [ Balint Reczey ]
   * Mount using --make-rslave to ensure safe unmounts for rbind mounts
 
=== modified file 'live-build/ubuntu-cpc/functions'
--- live-build/ubuntu-cpc/functions	2017-09-28 13:38:23 +0000
+++ live-build/ubuntu-cpc/functions	2017-10-05 14:40:41 +0000
@@ -274,10 +274,40 @@
     CHROOT_ROOT="$1"
 
     # If boot by partuuid has been requested, don't override.
-    if [ -f $CHROOT_ROOT/etc/default/grub.d/40-partuuid ] && \
-           grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-partuuid; then
+    if [ -f $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg ] && \
+           grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg
+    then
         return 0
     fi
     sed -i -e "s,root=[^ ]\+,root=LABEL=cloudimg-rootfs," \
         "$CHROOT_ROOT/boot/grub/grub.cfg"
 }
+
+
+# When running update-grub in a chroot on a build host, we don't want it to
+# probe for disks or probe for other installed OSes.  Extract common
+# diversion wrappers, so this isn't reinvented differently for each image.
+divert_grub() {
+	CHROOT_ROOT="$1"
+
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--rename /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" touch /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" chmod +x /usr/sbin/grub-probe
+
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--divert /etc/grub.d/30_os-prober.dpkg-divert \
+		--rename /etc/grub.d/30_os-prober
+}
+
+undivert_grub() {
+	CHROOT_ROOT="$1"
+
+	chroot "$CHROOT_ROOT" rm /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--rename /usr/sbin/grub-probe
+
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--divert /etc/grub.d/30_os-prober.dpkg-divert \
+		--rename /etc/grub.d/30_os-prober
+}
 
=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-10-03 15:31:27 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-10-05 14:40:41 +0000
@@ -119,8 +119,10 @@
 	if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
 		echo "partuuid found for root device; forcing it in Grub"
 		mkdir -p mountpoint/etc/default/grub.d
-		echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid
+		echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
+		divert_grub mountpoint
 		chroot mountpoint update-grub
+		undivert_grub mountpoint
 	fi
 fi
 
 
=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-10-03 15:31:26 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-10-05 14:40:41 +0000
@@ -66,7 +66,7 @@
         # and 033-disk-image-uefi.binary.  We want to fix this to not
         # have initramfs-tools installed at all on these images.
         echo "partuuid found for root device; omitting initrd"
-        echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid
+        echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
     fi
 
     chroot mountpoint apt-get -y update
@@ -119,10 +119,10 @@
         chroot mountpoint grub-install --target=i386-pc "${loop_device}"
     fi
 
-    chroot mountpoint dpkg-divert --local --rename /etc/grub.d/30_os-prober
+    divert_grub mountpoint
     chroot mountpoint update-grub
     replace_grub_root_with_label mountpoint
-    chroot mountpoint dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober
+    undivert_grub mountpoint
 
     chroot mountpoint apt-get -y clean
 
 
=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-05-12 19:20:22 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-10-05 14:40:41 +0000
@@ -50,10 +50,10 @@
         --boot-directory=/boot \
         --target=powerpc-ieee1275
 
-    chroot mountpoint dpkg-divert --local --rename /etc/grub.d/30_os-prober
+    divert_grub mountpoint
     chroot mountpoint update-grub
     replace_grub_root_with_label mountpoint
-    chroot mountpoint dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober
+    undivert_grub mountpoint
 
     umount_partition mountpoint
     rmdir mountpoint