SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Thu Oct 19 14:24:25 2006
New Revision: 7873

Modified:
   geninitrd/trunk/geninitrd
Log:
$IMAGESIZE is used only for ext2 rootfs.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Oct 19 14:24:25 2006
@@ -757,14 +757,6 @@
 	echo "/bin/initrd-busybox is missing !"
 	exit 1
 fi
-case "$(uname -m)" in
-ia64|amd64|x86_64|sparc64)
-	IMAGESIZE=3000
-	;;
-*)
-	IMAGESIZE=1500
-	;;
-esac
 
 while [ $# -gt 0 ]; do
 	case $1 in
@@ -931,7 +923,6 @@
 
 case "$INITRDFS" in
 	ext2)
-		IMAGESIZE=$((IMAGESIZE + 2000))
 		if [ ! -x /sbin/mke2fs ]; then
 			echo "/sbin/mke2fs is missing" 1>&2
 			exit 1
@@ -1055,6 +1046,15 @@
 fi
 
 if [ "$INITRDFS" = "ext2" ] ; then
+	case "$(uname -m)" in
+	ia64|amd64|x86_64|sparc64)
+		IMAGESIZE=5000
+		;;
+	*)
+		IMAGESIZE=1500
+		;;
+	esac
+
 	dd if=/dev/zero of="$IMAGE" bs=1k count="$IMAGESIZE" 2> /dev/null
 	mke2fs -q -F -b 1024 -m 0 "$IMAGE" 2>/dev/null 1>&2
 	tune2fs -i 0 "$IMAGE" >/dev/null 2>&1