Fix #113634, #114266.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@332 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/linuxrc b/generic/linuxrc
index 0d6550bc7ec138bcd4d2de1369241a42c85ddafe..88093fe8262b10222e4004df4171d98016e4ee49 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -25,6 +25,13 @@ fi
 mount -o remount,rw /
 mount -t proc proc /proc
 
+# activate suspend2
+if [ -w /proc/suspend2/do_resume ]
+then
+       echo "${GOOD}>>${NORMAL}${BOLD} Activating suspend2 resume..."
+       echo > /proc/suspend2/do_resume
+fi
+
 # Set up symlinks
 if [ "$0" = '/init' ]
 then
@@ -174,7 +181,8 @@ do
 
       # /dev/md
       lvmraid\=*)
-         RAID_DEVICES="${RAID_DEVICES} `parse_opt ${x}`"
+         RAID_DEVICES="`parse_opt ${x}`"
+         RAID_DEVICES="`echo ${RAID_DEVICES} | sed -e 's/,/ /g'`"
          ;;
 
       part\=*)