geninitrd/trunk/geninitrd

[baggins]

Author: baggins
Date: Sat May  6 20:33:58 2006
New Revision: 7385

Modified:
   geninitrd/trunk/geninitrd
Log:
- turn suspend2 on by default
- load required module for suspend2


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sat May  6 20:33:58 2006
@@ -21,7 +21,7 @@
 USEMDADMSTATIC="no"
 USEINSMODSTATIC="no"
 USE_SUSPEND="no"
-USE_SUSPEND2="no"
+USE_SUSPEND2="yes"
 uselvm="no"
 usenfs="no"
 # it should be safe to remove scsi_mod from here, but I'm not sure...
@@ -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 "       [--with-suspend] [--with-suspend2] [--without-dmraid]"
+	echo "       [--with-suspend] [--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
@@ -715,8 +715,8 @@
 	--with-suspend)
 		USE_SUSPEND="yes";
 		;;
-	--with-suspend2)
-		USE_SUSPEND2="yes";
+	--without-suspend2)
+		USE_SUSPEND2="no";
 		;;
 	--lvmtoolsversion=|--lvmversion=)
 		LVMTOOLSVERSION="`echo $1 | awk -F= '{print $2;}'`"
@@ -936,6 +936,10 @@
 	findmodule "$n"
 done
 
+if is_yes "$USE_SUSPEND2"; then
+	findmodule "-lzf"
+fi
+
 if [ -n "$ifneeded" -a -z "$MODULES" ]; then
 	if [ -n "$verbose" ]; then
 		echo "No modules are needed -- not building initrd image."