SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Wed Jul 20 01:28:24 2011
New Revision: 12263

Modified:
   geninitrd/trunk/geninitrd
Log:
ext2 fs needs IMAGESIZE earlier

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Jul 20 01:28:24 2011
@@ -1328,6 +1328,9 @@
 
 IMAGE=$(mktemp -t initrd.img-XXXXXX) || die "mktemp failed"
 
+IMAGESIZE=$(du -ks $DESTDIR | awk '{print int(($1+1023+512)/1024)*1024}')
+debug "image size: $IMAGESIZE KiB ($DESTDIR)"
+
 debug "Creating $INITRDFS image $IMAGE"
 case "$INITRDFS" in
   ext2)
@@ -1338,7 +1341,7 @@
 
 	local tmpmnt=$(mktemp -d -t initrd.mnt-XXXXXX)
 	debug "Mounting ext2 image $IMAGE to $tmpmnt"
-	mount -o loop -t ext2 "$IMAGE" "$tmpmnt"
+	mount -o loop -t ext2 "$IMAGE" "$tmpmnt" || die "mount failed, check dmesg(1)"
 	# We don't need this directory, so let's save space
 	rm -rf "$tmpmnt"/lost+found
 
@@ -1366,8 +1369,6 @@
 	CONFIG_BLK_DEV_RAM_SIZE=4096
 fi
 
-IMAGESIZE=$(du -ks $DESTDIR | awk '{print int(($1+1023+512)/1024)*1024}')
-debug 	"image size: $IMAGESIZE KiB ($DESTDIR)"
 if [ "$IMAGESIZE" -gt $CONFIG_BLK_DEV_RAM_SIZE ]; then
 	warn "Your image size is larger than $CONFIG_BLK_DEV_RAM_SIZE, Be sure to boot kernel with ramdisk_size=$IMAGESIZE!"
 fi