public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage-1: fix hibernation (close #6675) 

Fixes #6617.
This commit is contained in:
Nikolay Amiantov 2015-03-05 18:06:51 +03:00 committed by Vladimír Čunát
parent 4560b11551
commit b802018482
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/system/boot/stage-1-init.sh
View File

@ -177,20 +177,24 @@ fi
if test -e /sys/power/resume -a -e /sys/power/disk; then if test -e /sys/power/resume -a -e /sys/power/disk; then
if test -n "@resumeDevice@"; then if test -n "@resumeDevice@"; then
resumeDev="@resumeDevice@" resumeDev="@resumeDevice@"
resumeInfo="$(udevadm info -q property "$resumeDev" )"
else else
for sd in @resumeDevices@; do for sd in @resumeDevices@; do
# Try to detect resume device. According to Ubuntu bug: # Try to detect resume device. According to Ubuntu bug:
# https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
# When there are multiple swap devices, we can't know where will hibernate # When there are multiple swap devices, we can't know where will hibernate
# image reside. We can check all of them for swsuspend blkid. # image reside. We can check all of them for swsuspend blkid.
if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeInfo="$(udevadm info -q property "$sd" )"
if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
resumeDev="$sd" resumeDev="$sd"
break break
fi fi
done done
fi fi
if test -n "$resumeDev"; then if test -e "$resumeDev"; then
readlink -f "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..." resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')"
resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')"
echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
fi fi
fi fi