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

nixos stage-1: wait for devices during resumption attempt

Browse Source 
Also a microimprovement -- use `test -n` instead of `test -e`
since we have already checked that the file exists.
This commit is contained in:
Nikolay Amiantov 2016-08-08 01:35:43 +03:00
parent 3ae468e835
commit 986a40421a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,7 +346,7 @@ waitDevice() {
} }
# Try to resume - all modules are loaded now, and devices exist # Try to resume - all modules are loaded now.
if test -e /sys/power/tuxonice/resume; then if test -e /sys/power/tuxonice/resume; then
if test -n "$(cat /sys/power/tuxonice/resume)"; then if test -n "$(cat /sys/power/tuxonice/resume)"; then
echo 0 > /sys/power/tuxonice/user_interface/enabled echo 0 > /sys/power/tuxonice/user_interface/enabled
@ -355,7 +355,7 @@ if test -e /sys/power/tuxonice/resume; then
fi 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@" && waitDevice "@resumeDevice@"; then
resumeDev="@resumeDevice@" resumeDev="@resumeDevice@"
resumeInfo="$(udevadm info -q property "$resumeDev" )" resumeInfo="$(udevadm info -q property "$resumeDev" )"
else else
@ -364,14 +364,16 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
# 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 the hibernate # when there are multiple swap devices, we can't know where the hibernate
# image will reside. We can check all of them for swsuspend blkid. # image will reside. We can check all of them for swsuspend blkid.
resumeInfo="$(test -e "$sd" && udevadm info -q property "$sd")" if waitDevice "$sd"; then
if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeInfo="$(udevadm info -q property "$sd")"
resumeDev="$sd" if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
break resumeDev="$sd"
break
fi
fi fi
done done
fi fi
if test -e "$resumeDev"; then if test -n "$resumeDev"; then
resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')" resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')"
resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')" resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')"
echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..." echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..."