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

Imported using git-ubuntu import.

Changelog parent: 7bff7abdf4

New changelog entries:
  * fix remaining wrong references to /etc/default/grub.d/40-partuuid

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.467) artful; urgency=medium
+
+  * fix remaining wrong references to /etc/default/grub.d/40-partuuid
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 04 Oct 2017 23:52:21 -0700
+
 livecd-rootfs (2.466) artful; urgency=medium
 
   * ubuntu-server: drop hard-coded test key from the subiquity overlay in

live-build/functions

@@ -276,8 +276,9 @@ replace_grub_root_with_label() {
     CHROOT_ROOT="$1"
 
     # If boot by partuuid has been requested, don't override.
-    if [ -f $CHROOT_ROOT/etc/default/grub.d/40-partuuid ] && \
+    if [ -f $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg ] && \
-           grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-partuuid.cfg; then
+           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=${fs_label}," \