diff options
author | Andrew Gaffney <agaffney@gentoo.org> | 2009-09-04 23:43:08 -0500 |
---|---|---|
committer | Andrew Gaffney <agaffney@gentoo.org> | 2009-09-04 23:43:08 -0500 |
commit | 588ef85661999d2cbb7d463d20b8ba48cb37d3a4 (patch) | |
tree | 8b5dddefed043a0ec09b6dec2fac63e8544a0bf8 /defaults/initrd.scripts | |
parent | Enable DISKLABEL=yes by default (diff) | |
download | genkernel-588ef85661999d2cbb7d463d20b8ba48cb37d3a4.tar.gz genkernel-588ef85661999d2cbb7d463d20b8ba48cb37d3a4.tar.bz2 genkernel-588ef85661999d2cbb7d463d20b8ba48cb37d3a4.zip |
Apply patch from Gentoo bug #220913 for tuxonice resume
Diffstat (limited to 'defaults/initrd.scripts')
-rwxr-xr-x | defaults/initrd.scripts | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 66130ae3..4c233bbe 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -856,24 +856,30 @@ rundebugshell() { fi } +do_resume() { + if [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ]; then + tuxonice_resume + else + swsusp_resume + fi +} + swsusp_resume() { # determine swap resume partition local device=$(ls -lL "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 5-6 | sed 's/,\ */:/') [ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume - return 0 } tuxonice_resume() { - [ -d /proc/suspend2 -o -d /sys/power/suspend2 -o -d /sys/power/tuxonice ] || return - 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 local tuxonice_userui_program="/sys/power/tuxonice/user_interface/program" local tuxonice_do_resume="/sys/power/tuxonice/do_resume" + local tuxonice_resumedev="/sys/power/tuxonice/resume" + local tuxonice_replace_swsusp="/sys/power/tuxonice/replace_swsusp" # # Backward compatibility @@ -881,13 +887,27 @@ tuxonice_resume() { if [ -e /sys/power/suspend2 ]; then tuxonice_userui_program="/sys/power/suspend2/user_interface/program" tuxonice_do_resume="/sys/power/suspend2/do_resume" + tuxonice_resumedev="/sys/power/suspend2/resume" + tuxonice_replace_swsusp="/sys/power/suspend2/replace_swsusp" elif [ -e /proc/suspend2 ]; then tuxonice_userui_program="/proc/suspend2/userui_program" tuxonice_do_resume="/proc/suspend2/do_resume" + tuxonice_resumedev="/proc/suspend2/resume" + tuxonice_replace_swsusp="/proc/suspend2/replace_swsusp" + fi + + # if 'use_swsusp' is given, use swsusp instead + if grep "use_swsusp" /proc/cmdline > /dev/null 2>&1; then + echo 0 > ${tuxonice_replace_swsusp} + swsusp_resume + return fi modules_scan tuxonice + # we both configure tuxonice and activate resuming, + # however the kernel will resume only if an image is found + if ! grep suspend_noui /proc/cmdline > /dev/null 2>&1; then which suspend2ui_text > /dev/null 2>&1 && which suspend2ui_text > "${tuxonice_userui_program}" which tuxoniceui_text > /dev/null 2>&1 && which tuxoniceui_text > "${tuxonice_userui_program}" @@ -900,8 +920,9 @@ tuxonice_resume() { which tuxoniceui_fbsplash > /dev/null 2>&1 && which tuxoniceui_fbsplash > "${tuxonice_userui_program}" fi - echo > "${tuxonice_do_resume}" fi + echo "${REAL_RESUME}" > "${tuxonice_resumedev}" + echo > "${tuxonice_do_resume}" } find_loop() { |