From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 18 Aug 2010 19:52:57 +0000 (+0200)
Subject: Flashimage use UUID for fstab.
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~106
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3cbeb8c7a14843ea43695efa6bf02cceb2579ba5

Flashimage use UUID for fstab.
---

diff --git a/lfs/flash-images b/lfs/flash-images
index 52fde64a88..99ed45f284 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -94,10 +94,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 	sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf
 	sed -i -e "s|KVER|$(KVER)|g" $(MNThdd)/boot/grub/grub.conf
-	sed -i -e "s|ROOT|/dev/sda3|g" $(MNThdd)/boot/grub/grub.conf
+	sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf
 	ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
+	sed -i -e "s|DEVICE1|UUID=$$(blkid -sUUID $(IMGboot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
 	sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab
-	sed -i -e "s|DEVICE|/dev/sda|g" $(MNThdd)/etc/fstab
+	sed -i -e "s|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
+	sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
 	sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab
 
 	# Copy grub files manually