- suspend2->tuxonice rename internally (old option preserved)

svn-id: @8813

diff --git a/geninitrd b/geninitrd
index 49cae874d6044aeba780f2e3ae7dd3849dddb6ff..fb1e336811df2f0043ac6f8673628ea8fa2928a1 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -26,7 +26,7 @@ USERAIDSTART="yes"
 USEMDADMSTATIC="no"
 USEINSMODSTATIC="no"
 USE_SUSPEND="yes"
-USE_SUSPEND2="yes"
+USE_TUXONICE="yes"
 uselvm="no"
 usenfs="no"
 # it should be safe to remove scsi_mod from here, but I'm not sure...
@@ -81,7 +81,7 @@ usage () {
        echo "       [ --with-fbsplash] [--without-fbsplash]"
        echo "       [--lvmtoolsversion=1|2] [--with-udev] [--without-udev]"
        echo "       [--with-suspend] [--without-suspend]"
-       echo "       [--with-suspend2] [--without-suspend2]"
+       echo "       [--with-tuxonice] [--without-tuxonice]"
        echo "       [--without-dmraid]"
        echo "       <initrd-image> <kernel-version>"
        echo ""
@@ -774,11 +774,11 @@ while [ $# -gt 0 ]; do
        --without-suspend)
                USE_SUSPEND="no"
                ;;
-       --with-suspend2)
-               USE_SUSPEND2="yes"
+       --with-suspend2 | --with-tuxonice)
+               USE_TUXONICE="yes"
                ;;
-       --without-suspend2)
-               USE_SUSPEND2="no"
+       --without-suspend2 | --without-tuxonice)
+               USE_TUXONICE="no"
                ;;
        --lvmtoolsversion=|--lvmversion=)
                LVMTOOLSVERSION="`echo $1 | awk -F= '{print $2;}'`"
@@ -945,8 +945,8 @@ if [ ! -d "/lib/modules/$kernel" ]; then
        die "/lib/modules/$kernel is not a directory."
 fi
 
-if is_yes "$USE_SUSPEND" && is_yes "$USE_SUSPEND2"; then
-       die "Suspend2 shouldn't be used in parallel with mainline suspend!."
+if is_yes "$USE_SUSPEND" && is_yes "$USE_TUXONICE"; then
+       die "Tuxonice shouldn't be used in parallel with mainline suspend!."
 fi
 
 if is_yes "$FB_SPLASH"; then
@@ -995,7 +995,7 @@ for n in $BASICMODULES; do
        findmodule "$n"
 done
 
-if is_yes "$USE_SUSPEND2"; then
+if is_yes "$USE_TUXONICE"; then
        findmodule "-lzf"
 fi
 
@@ -1093,7 +1093,7 @@ initrd_gen_suspend() {
        echo "resume" >> "$s"
 }
 
-initrd_gen_suspend2() {
+initrd_gen_tuxonice() {
        mkdir -p $MNTIMAGE/sys
        mkdir -p $MNTIMAGE/proc
 cat << 'EOF' >> "$s"
@@ -1435,8 +1435,8 @@ if is_yes "$USE_SUSPEND"; then
        initrd_gen_suspend
 fi
 
-if is_yes "$USE_SUSPEND2"; then
-       initrd_gen_suspend2
+if is_yes "$USE_TUXONICE"; then
+       initrd_gen_tuxonice
 fi
 
 if [ "$dmraid_devices" ]; then

diff --git a/geninitrd.sysconfig b/geninitrd.sysconfig
index 311ca06e40d141c0242b5bb0a6c2afb8e8f2c75c..6b7f9061095cbd2fb3ef050ab2776603b9fb4d50 100644 (file)
--- a/geninitrd.sysconfig
+++ b/geninitrd.sysconfig
@@ -18,10 +18,13 @@ COMPRESS=yes
 #PROBSTATICMODULES=yes
 
 ## Use suspend to disk?
+## Conflicts with USE_TUXONICE
 USE_SUSPEND=no
 
-## Do install software suspend2 modules?
-USE_SUSPEND2=no
+## Do install software tuxonice modules?
+## Conflicts with USE_SUSPEND
+## Formerly Suspend2
+USE_TUXONICE=no
 
 ## Should we use splash image?
 # FB_SPLASH=yes