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

Move resume section after udev launch - on some systems devices are recognized by kernel only after udev works. 

svn path=/nixos/trunk/; revision=23176
This commit is contained in:
Michael Raskin 2010-08-14 20:12:05 +00:00
parent f0eb823a34
commit 295df77f21
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,20 +110,6 @@ done
mknod /dev/null c 1 3 mknod /dev/null c 1 3
# Try to resume - all modules are loaded now.
if test -e /sys/power/tuxonice/resume; then
if test -n "$(cat /sys/power/tuxonice/resume)"; then
echo 0 > /sys/power/tuxonice/user_interface/enabled
echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
fi
fi
if test -e /sys/power/resume -a -e /sys/power/disk; then
echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
echo shutdown > /sys/power/disk
fi
# Create device nodes in /dev. # Create device nodes in /dev.
echo "running udev..." echo "running udev..."
export UDEV_CONFIG_FILE=@udevConf@ export UDEV_CONFIG_FILE=@udevConf@
@ -145,6 +131,20 @@ if test -n "$debug1devices"; then fail; fi
@postDeviceCommands@ @postDeviceCommands@
# Try to resume - all modules are loaded now, and devices exist
if test -e /sys/power/tuxonice/resume; then
if test -n "$(cat /sys/power/tuxonice/resume)"; then
echo 0 > /sys/power/tuxonice/user_interface/enabled
echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
fi
fi
if test -e /sys/power/resume -a -e /sys/power/disk; then
echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
echo shutdown > /sys/power/disk
fi
# Return true if the machine is on AC power, or if we can't determine # Return true if the machine is on AC power, or if we can't determine
# whether it's on AC power. # whether it's on AC power.
onACPower() { onACPower() {