Merge lp:~xnox/livecd-rootfs/fix-fs-label into lp:livecd-rootfs

[Dimitri John Ledkov]

[Philip Roche (philroche)]

Following conversation on IRC this looks good. +1

review: Approve

[Steve Langasek (vorlon)]

review: Needs Fixing

[Francis Ginther (fginther)]

As discussed in IRC, I think this should tolerate both the empty and non-empty root values.

[Francis Ginther (fginther)]

That looks good.

review: Approve

[Steve Langasek (vorlon)]

review: Approve

[lp:~xnox/livecd-rootfs/fix-fs-label]

1554. By Dimitri John Ledkov on 2017-10-10

Now that grub-related diversions have been factored out in 2.466
instead of having bogus root=stuff arg generated in grub.cfg, it is
actually empty. Therefore update the sed command to make the arg in
the root= token optional. This should resolve non-booting livecd cpc
images.

=== modified file 'debian/changelog'
--- debian/changelog	2017-10-09 01:49:34 +0000
+++ debian/changelog	2017-10-10 12:23:40 +0000
@@ -1,3 +1,13 @@
+livecd-rootfs (2.471) UNRELEASED; urgency=medium
+
+  * Now that grub-related diversions have been factored out in 2.466
+    instead of having bogus root=stuff arg generated in grub.cfg, it is
+    actually empty. Therefore update the sed command to make the arg in
+    the root= token optional. This should resolve non-booting livecd cpc
+    images.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 10 Oct 2017 12:53:43 +0100
+
 livecd-rootfs (2.470) artful; urgency=medium
 
   * Add initial support for preinstallation of snaps in images, and
 
=== modified file 'live-build/functions'
--- live-build/functions	2017-10-05 06:50:26 +0000
+++ live-build/functions	2017-10-10 12:23:40 +0000
@@ -281,7 +281,7 @@
     then
         return 0
     fi
-    sed -i -e "s,root=[^ ]\+,root=LABEL=${fs_label}," \
+    sed -i -e "s,root=[^ ]*,root=LABEL=${fs_label}," \
         "$CHROOT_ROOT/boot/grub/grub.cfg"
 }