- Suspend2 can have its directory in /proc/suspend2 or /sys/power/suspend2,

  depending on kernel version, initrd must support both.

svn-id: @7982

diff --git a/geninitrd b/geninitrd
index 87da037c352dec473ffd55266af87c3a14958910..b9da5ed211902ddb0293baef8fb6227ee01ecdc7 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -1139,11 +1139,14 @@ initrd_gen_suspend2() {
        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
 }