Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 197244
Collapse All | Expand All

(-)genkernel-3.4.9_pre3.org/generic/initrd.scripts (-23 / +27 lines)
Lines 859-897 setup_unionfs() { Link Here
859
#	return 0
859
#	return 0
860
#}
860
#}
861
861
862
suspend2_resume() {
862
tuxonice_resume() {
863
	if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then
863
	[ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ] || return
864
		local splash_theme
865
864
866
		if grep "splash=" /proc/cmdline > /dev/null 2>&1; then
865
	local splash_theme
867
			splash_theme=`cat /proc/cmdline | sed 's/.*splash=/splash=/' | sed 's/ .*//' | sed 's/.*theme://' | sed 's/,.*//'`
868
		fi
869
866
870
		local suspend2_userui_program="/sys/power/suspend2/user_interface/program"
867
	if grep "splash=" /proc/cmdline > /dev/null 2>&1; then
871
		local suspend2_do_resume="/sys/power/suspend2/do_resume"
868
		splash_theme=$(cat /proc/cmdline | sed 's/.*splash=/splash=/' | sed 's/ .*//' | sed 's/.*theme://' | sed 's/,.*//')
869
	fi
872
870
873
		#
871
	local tuxonice_userui_program="/sys/power/tuxonice/user_interface/program"
874
		# Backward compatibility
872
	local tuxonice_do_resume="/sys/power/tuxonice/do_resume"
875
		#
876
		if [ -e /proc/suspend2 ]; then
877
			suspend2_userui_program="/proc/suspend2/userui_program"
878
			suspend2_do_resume="/proc/suspend2/do_resume"
879
		fi
880
873
881
		modules_scan suspend2
874
	#
875
	# Backward compatibility
876
	#
877
	if [ -e /sys/power/suspend2 ]; then
878
		tuxonice_userui_program="/sys/power/suspend2/user_interface/program"
879
		tuxonice_do_resume="/sys/power/suspend2/do_resume"
880
	elif [ -e /proc/suspend2 ]; then
881
		tuxonice_userui_program="/proc/suspend2/userui_program"
882
		tuxonice_do_resume="/proc/suspend2/do_resume"
883
	fi
882
884
883
		if which suspend2ui_text > /dev/null 2>&1; then
885
	modules_scan tuxonice
884
			which suspend2ui_text > "${suspend2_userui_program}"
886
885
		fi
887
	if ! grep suspend_noui /proc/cmdline > /dev/null 2>&1; then
888
		which suspend2ui_text > /dev/null 2>&1 && which suspend2ui_text > "${tuxonice_userui_program}"
889
		which tuxoniceui_text > /dev/null 2>&1 && which tuxoniceui_text > "${tuxonice_userui_program}"
886
890
887
		if [ -n "${splash_theme}" ]; then
891
		if [ -n "${splash_theme}" ]; then
888
			ln -s /etc/splash/${splash_theme} /etc/splash/suspend2
892
			ln -s /etc/splash/${splash_theme} /etc/splash/suspend2
893
			ln -s /etc/splash/${splash_theme} /etc/splash/tuxonice
889
894
890
			if which suspend2ui_fbsplash > /dev/null 2>&1; then
895
			which suspend2ui_fbsplash > /dev/null 2>&1 && which suspend2ui_fbsplash > "${tuxonice_userui_program}"
891
				which suspend2ui_fbsplash > "${suspend2_userui_program}"
896
			which tuxoniceui_fbsplash > /dev/null 2>&1 && which tuxoniceui_fbsplash > "${tuxonice_userui_program}"
892
			fi
893
		fi
897
		fi
894
898
895
		echo > "${suspend2_do_resume}"
899
		echo > "${tuxonice_do_resume}"
896
	fi
900
	fi
897
}
901
}
(-)genkernel-3.4.9_pre3.org/generic/linuxrc (-1 / +1 lines)
Lines 250-254 fi Link Here
250
#suspend_resume
250
#suspend_resume
251
suspend2_resume
251
tuxonice_resume
252
252
253
if [ "${CDROOT}" -eq '1' ]
253
if [ "${CDROOT}" -eq '1' ]
254
then
254
then

Return to bug 197244