geninitrd/trunk/geninitrd

[arekm]

Author: arekm
Date: Thu Apr 27 22:57:02 2006
New Revision: 7371

Modified:
   geninitrd/trunk/geninitrd
Log:
Update support for recent suspend2 versions (Bartosz Świątek).

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Apr 27 22:57:02 2006
@@ -28,7 +28,6 @@
 PRESCSIMODS="-scsi_mod unknown -sd_mod"
 PREIDEMODS="-ide-core unknown -ide-detect -ide-disk"
 PREIDEMODSOLD="-ide-probe -ide-probe-mod -ide-disk"
-SUSPEND2MODS="-suspend2_core -suspend2_lzf -suspend2_block_io -suspend2_swap -suspend_core -suspend_text -suspend_lzf -suspend_block_io -suspend_swap"
 target=""
 kernel=""
 force=""
@@ -1039,21 +1038,14 @@
 }
 
 initrd_gen_suspend2() {
-	MODULES=""
-	for mod in $SUSPEND2MODS; do
-	    is_yes "$BOOT_SPLASH" && [ "$mod" = "-suspend-text" ] && mod="-suspend_bootsplash"
-	    findmodule "$mod"
-	done
-	modules_install "$MODULES"
     	mkdir -p $MNTIMAGE/sys
     	mkdir -p $MNTIMAGE/proc
 cat << EOF >> "$s"
 mount -t proc none /proc
 if [ "\$(awk ' /resume2=/  { print "yes"; } ' /proc/cmdline)" = "yes" ]; then
 EOF
-	modules_add_linuxrc "$MODULES" "$s"
 cat << EOF >> "$s"
-		echo > /proc/software_suspend/activate
+		echo > /proc/suspend2/do_resume
 fi
 umount /proc
 EOF