Import patches-unapplied version 2.471 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: fb1b5e73e3

New changelog entries:
  * 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.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.471) artful; 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 <xnox@ubuntu.com>  Tue, 10 Oct 2017 13:26:21 +0100
+
 livecd-rootfs (2.470) artful; urgency=medium
 
   * Add initial support for preinstallation of snaps in images, and

live-build/functions

@@ -281,7 +281,7 @@ replace_grub_root_with_label() {
     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"
 }