From b05311165170c07d65bc27ea8edf27434c54efca Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 4 Oct 2017 23:52:21 -0700 Subject: [PATCH] Import patches-unapplied version 2.467 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 7bff7abdf4c17df8edb3c04e774a861ce621be84 New changelog entries: * fix remaining wrong references to /etc/default/grub.d/40-partuuid --- debian/changelog | 6 ++++++ live-build/functions | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80a26fc5..946fbfad 100644 --- a/debian/changelog +++ b/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 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 diff --git a/live-build/functions b/live-build/functions index 4b316eb5..ec6d15a7 100644 --- a/live-build/functions +++ b/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 ] && \ - grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-partuuid.cfg; 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=${fs_label}," \