and the filename was still wrong

This commit is contained in:
Steve Langasek 2017-10-04 23:50:26 -07:00
parent bc221a8d67
commit 90e7ee57c3

View File

@ -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}," \