Suspend 2 stuff renamed to suspend2 (it's old anyway).

svn-id: @7336

diff --git a/geninitrd b/geninitrd
index f2ba2d049c5cac35af037c2001bef2d8b01e5695..4cb225128b5d9f9c4fb37ca206142eafadfb5b7f 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -27,7 +27,7 @@ usenfs="no"
 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 @@ usage () {
        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 @@ while [ $# -gt 0 ]; do
        --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 @@ modules_add_linuxrc "$MODULES" "$s"
 #      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 @@ if is_yes "$USE_UDEV"; then
        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

diff --git a/geninitrd.sysconfig b/geninitrd.sysconfig
index 7b6587650d6566db518d5cdb5df83392d498854c..be0f5dea7c6329a7ccb5747da5c91dfc017d7b0e 100644 (file)
--- a/geninitrd.sysconfig
+++ b/geninitrd.sysconfig
@@ -12,8 +12,8 @@ COMPRESS=yes
 
 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