]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
flash-image: fix root uuid on some build machines.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Feb 2016 18:49:49 +0000 (19:49 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Feb 2016 18:49:49 +0000 (19:49 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
lfs/flash-images

index 530bf339b80b95ae2e86bec54ed7a0d91cd212f7..f4558222d6c439db861d3a232925893b5e5f291a 100644 (file)
@@ -182,9 +182,10 @@ endif
        mkdir -pv $(MNThdd)/boot/grub
        chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
 
-       # Insert the UUID because grub-mkconfig fails to detect that correctly
+       # Insert the UUID because grub-mkconfig often fails to
+       # detect that correctly
        sed -i $(MNThdd)/boot/grub/grub.cfg \
-               -e "s/root=[a-z0-9\/]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+               -e "s/root=[A-Za-z0-9=-\/]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
 
        # Install GRUB
        grub-install --force --recheck --no-floppy \