Author: glen
Date: Fri Oct 12 15:39:43 2007
New Revision: 8813
Modified:
geninitrd/trunk/geninitrd
geninitrd/trunk/geninitrd.sysconfig
Log:
- suspend2->tuxonice rename internally (old option preserved)
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Fri Oct 12 15:39:43 2007
@@ -26,7 +26,7 @@
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 @@
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 @@
--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 @@
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 @@
findmodule "$n"
done
-if is_yes "$USE_SUSPEND2"; then
+if is_yes "$USE_TUXONICE"; then
findmodule "-lzf"
fi
@@ -1093,7 +1093,7 @@
echo "resume" >> "$s"
}
-initrd_gen_suspend2() {
+initrd_gen_tuxonice() {
mkdir -p $MNTIMAGE/sys
mkdir -p $MNTIMAGE/proc
cat << 'EOF' >> "$s"
@@ -1435,8 +1435,8 @@
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
Modified: geninitrd/trunk/geninitrd.sysconfig
==============================================================================
--- geninitrd/trunk/geninitrd.sysconfig (original)
+++ geninitrd/trunk/geninitrd.sysconfig Fri Oct 12 15:39:43 2007
@@ -18,10 +18,13 @@
#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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
