SVN: geninitrd/trunk/geninitrd

[lmasko]

Author: lmasko
Date: Sat Nov 18 14:57:02 2006
New Revision: 7982

Modified:
   geninitrd/trunk/geninitrd
Log:
- Suspend2 can have its directory in /proc/suspend2 or /sys/power/suspend2,
  depending on kernel version, initrd must support both.


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sat Nov 18 14:57:02 2006
@@ -1139,11 +1139,14 @@
 	mkdir -p $MNTIMAGE/proc
 cat << 'EOF' >> "$s"
 mount -t proc none /proc
+mount -t sysfs none /sys
 if [ "$(awk ' /resume2=/  { print "yes"; } ' /proc/cmdline)" = "yes" ]; then
 EOF
 cat << EOF >> "$s"
-		echo > /proc/suspend2/do_resume
+		[ -e /proc/suspend2/do_resume ] && echo > /proc/suspend2/do_resume
+		[ -e /sys/power/suspend2/do_resume ] && echo > /sys/power/suspend2/do_resume
 fi
+umount /sys
 umount /proc
 EOF
 }