Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / lfs / flash-images

diff --git a/lfs/flash-images b/lfs/flash-images
index b78691e083ea40a309bb336552ba492a5307fa68..e9bd0434b514a3e78699cc41a098c3a1fca78867 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -79,7 +79,7 @@ endif
 # /boot:  128MB - OFFSET
 # /    : 1200 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 2477600
+S_ROOT := 2476032
 
 ifeq "$(EFI)" "1"
  S_EFI = 65536 # 32 MB
@@ -215,6 +215,12 @@ endif
        rm -f $(MNThdd)/etc/grub.d/11_linux_scon
 endif
 
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       # Insert the UUID to uENV.txt
+       sed -i $(MNThdd)/boot/uENV.txt \
+               -e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
+endif
+
        # Set ramdisk mode to automatic
        echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk