From bc221a8d67a9786d9d0babdffafa1d94207505a3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 4 Oct 2017 23:38:22 -0700 Subject: [PATCH 1/2] fix a remaining wrong reference to /etc/default/grub.d/40-partuuid --- live-build/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/functions b/live-build/functions index 4b316eb5..551a3c35 100644 --- a/live-build/functions +++ b/live-build/functions @@ -276,7 +276,7 @@ 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-partuuid.cfg ] && \ grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-partuuid.cfg; then return 0 fi From 90e7ee57c34f5a1fea1fd49a024962d8def5d6a8 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 4 Oct 2017 23:50:26 -0700 Subject: [PATCH 2/2] and the filename was still wrong --- live-build/functions | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/live-build/functions b/live-build/functions index 551a3c35..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.cfg ] && \ - 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}," \