geninitrd/trunk: geninitrd geninitrd.sysconfig

[arekm]

Author: arekm
Date: Sun Apr  9 14:28:00 2006
New Revision: 7336

Modified:
   geninitrd/trunk/geninitrd
   geninitrd/trunk/geninitrd.sysconfig
Log:
Suspend 2 stuff renamed to suspend2 (it's old anyway).

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sun Apr  9 14:28:00 2006
@@ -27,7 +27,7 @@
 PRESCSIMODS="-scsi_mod unknown -sd_mod"
 PREIDEMODS="-ide-core unknown -ide-detect -ide-disk"
 PREIDEMODSOLD="-ide-probe -ide-probe-mod -ide-disk"
-SUSPENDMODS="-suspend2_core -suspend2_lzf -suspend2_block_io -suspend2_swap -suspend_core -suspend_text -suspend_lzf -suspend_block_io -suspend_swap"
+SUSPEND2MODS="-suspend2_core -suspend2_lzf -suspend2_block_io -suspend2_swap -suspend_core -suspend_text -suspend_lzf -suspend_block_io -suspend_swap"
 target=""
 kernel=""
 force=""
@@ -58,7 +58,7 @@
 	echo "       [--initrdfs=rom|ext2|cram] [--modules-conf=<modules.conf>]" 
 	echo "       [--with-raidstart] [--without-raidstart] [--with-insmod-static]" 
 	echo "       [--without-bootsplash] [--lvmtoolsversion=1|2] [--without-udev]"
-	echo "       [--without-suspend] [--without-dmraid]"
+	echo "       [--without-suspend2] [--without-dmraid]"
 	echo "       <initrd-image> <kernel-version>" 
 	echo "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" 
 	exit 1
@@ -712,8 +712,8 @@
 	--without-bootsplash)
 		BOOT_SPLASH="no"
 		;;
-	--without-suspend)
-		USESUSPEND="no";
+	--without-suspend2)
+		USESUSPEND2="no";
 		;;
 	--lvmtoolsversion=|--lvmversion=)
 		LVMTOOLSVERSION="`echo $1 | awk -F= '{print $2;}'`"
@@ -1013,9 +1013,9 @@
 #	echo "losetup $rootdev1 /loopfs$loopFile" >> "$RCFILE"
 #fi
 
-initrd_gen_suspend() {
+initrd_gen_suspend2() {
 	MODULES=""
-	for mod in $SUSPENDMODS; do
+	for mod in $SUSPEND2MODS; do
 	    is_yes "$BOOT_SPLASH" && [ "$mod" = "-suspend-text" ] && mod="-suspend_bootsplash"
 	    findmodule "$mod"
 	done
@@ -1266,8 +1266,8 @@
 	initrd_gen_udev
 fi
 
-if is_yes "$USESUSPEND"; then
-	initrd_gen_suspend
+if is_yes "$USESUSPEND2"; then
+	initrd_gen_suspend2
 fi
 
 if is_yes "$USE_DMRAID"; then

Modified: geninitrd/trunk/geninitrd.sysconfig
==============================================================================
--- geninitrd/trunk/geninitrd.sysconfig	(original)
+++ geninitrd/trunk/geninitrd.sysconfig	Sun Apr  9 14:28:00 2006
@@ -12,8 +12,8 @@
 
 USE_UDEV=no
 
-## Do install software suspend modules?
-#USE_SUSPEND=no
+## Do install software suspend2 modules?
+#USE_SUSPEND2=no
 
 ## Do install SCSI modules (if / is on SCSI partition)?
 PROBESCSI=yes