[patch] generic.diff

generic.diff (text/plain), 1.81 KB, created by Alon Bar-Lev (RETIRED) on 2006-06-10 11:51:23 UTC

diff -urNp generic.org/initrd.scripts generic/initrd.scripts
--- generic.org/initrd.scripts	2006-06-10 22:36:50.000000000 +0300
+++ generic/initrd.scripts	2006-06-11 00:25:27.000000000 +0300
@@ -38,7 +38,7 @@ modules_scan() {
 	local MODS
 	[ -d /etc/modules/${1} ] || touch /etc/modules/${1}
 
-	MODS=`cat /etc/modules/${1}`
+	[ -f /etc/modules/${1} ] && MODS=`cat /etc/modules/${1}`
 	for x in ${MODS}
 	do
 		MLOAD=`echo ${MLIST} | sed -e "s/.*${x}.*/${x}/"`
@@ -621,3 +621,29 @@ setup_unionfs() {
 		USE_UNIONFS_NORMAL=0
 	fi
 }
+
+suspend2_resume() {
+	if [ -d /proc/suspend2 ]; then
+		local splash_theme
+
+		if grep "splash=" /proc/cmdline > /dev/null 2>&1; then
+			splash_theme=`cat /proc/cmdline | sed 's/.*splash=/splash=/' | sed 's/ .*//' | sed 's/.*theme://' | sed 's/,.*//'`
+		fi
+
+		if which suspend2ui_text > /dev/null 2>&1; then
+			echo `which suspend2ui_text` > /proc/suspend2/userui_program
+		fi
+
+		if [ -n "${splash_theme}" ]; then
+			ln -s /etc/splash/${splash_theme} /etc/splash/suspend2
+
+			if which suspend2ui_fbsplash > /dev/null 2>&1; then
+				echo `which suspend2ui_fbsplash` > /proc/suspend2/userui_program
+			fi
+		fi
+
+		modules_scan suspend2
+		echo > /proc/suspend2/do_resume
+	fi
+}
+
diff -urNp generic.org/linuxrc generic/linuxrc
--- generic.org/linuxrc	2006-06-10 22:36:50.000000000 +0300
+++ generic/linuxrc	2006-06-10 23:56:54.000000000 +0300
@@ -25,13 +25,6 @@ fi
 mount -o remount,rw /
 mount -t proc proc /proc
 
-# activate suspend2
-if [ -w /proc/suspend2/do_resume ]
-then
-	echo -e "${GOOD}>>${NORMAL}${BOLD} Activating suspend2 resume..."
-	echo > /proc/suspend2/do_resume
-fi
-
 # Set up symlinks
 if [ "$0" = '/init' ]
 then
@@ -245,6 +238,8 @@ fi
 # Run debug shell if requested
 rundebugshell
 
+suspend2_resume
+
 if [ "${CDROOT}" -eq '1' ]
 then
 	if [ ! "${USE_UNIONFS_NORMAL}" -eq '1' ]