From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 23 Feb 2016 18:49:49 +0000 (+0100)
Subject: flash-image: fix root uuid on some build machines.
X-Git-Tag: v2.19-core100~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38956241bb0644480887aeb9a399e3d9ba2fc3f4;p=ipfire-2.x.git

flash-image: fix root uuid on some build machines.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/flash-images b/lfs/flash-images
index 530bf339b8..f4558222d6 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -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 \