From: Tim Yamin <plasmaroo@gentoo.org>
Date: Mon, 5 Dec 2005 22:15:58 +0000 (+0000)
Subject: Fix #113634, #114266.
X-Git-Tag: v3.4.10.902~420
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=864698c24ec21d34546a361c16b41b6d03c3833c;p=genkernel.git

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 0d6550b..88093fe 100644
--- 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\=*)