Author: raskin
Date: Sat Aug 14 20:12:05 2010
New Revision: 23176
URL: https://svn.nixos.org/websvn/nix/?rev=23176&sc=1
Log:
Move resume section after udev launch - on some systems devices are recognized
by kernel only after udev works.
Modified:
nixos/trunk/modules/system/boot/stage-1-init.sh
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Sat Aug 14 18:21:04
2010 (r23175)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Sat Aug 14 20:12:05
2010 (r23176)
@@ -110,20 +110,6 @@
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.
echo "running udev..."
export udev_config_fi...@udevconf@
@@ -145,6 +131,20 @@
@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
# whether it's on AC power.
onACPower() {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
