Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 156445 | Differences between
and this patch

Collapse All | Expand All

(-)genkernel-3.4.9.org/generic/initrd.scripts (+12 lines)
Lines 982-987 swsusp_resume() { Link Here
982
	return 0
982
	return 0
983
}
983
}
984
984
985
suspend_resume() {
986
	which resume > /dev/null 2>&1 || return
987
	local args
988
	local features="$(resume --version | grep FEATURES)"
989
	[ -n "${REAL_RESUME}" ] && args="${args} --resume_device=\"${REAL_RESUME}\""
990
	if ! grep suspend_noui /proc/cmdline > /dev/null 2>&1; then
991
		echo "${features}" | grep "fbsplash" > /dev/null && grep "splash=" /proc/cmdline > /dev/null && args="${args} --parameter=\"splash=y\""
992
	fi
993
	[ -c /dev/snapshot ] || mknod /dev/snapshot c 10 231
994
	eval resume ${args}
995
}
996
985
tuxonice_resume() {
997
tuxonice_resume() {
986
	[ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ] || return
998
	[ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ] || return
987
999
(-)genkernel-3.4.9.org/generic/linuxrc (-1 / +1 lines)
Lines 281-287 rundebugshell Link Here
281
if [ "${NORESUME}" != '1' ]
281
if [ "${NORESUME}" != '1' ]
282
then
282
then
283
	swsusp_resume
283
	swsusp_resume
284
#	suspend_resume
284
	suspend_resume
285
#	suspend2_resume
285
#	suspend2_resume
286
	tuxonice_resume
286
	tuxonice_resume
287
fi
287
fi

Return to bug 156445