Author: eelco
Date: Fri Mar 2 13:17:05 2012
New Revision: 32740
URL: https://nixos.org/websvn/nix/?rev=32740&sc=1
Log:
* Run the stage 2 debug shell at a more useful point (just before
starting Upstart). This also causes $PATH to be set to something
more sensible.
Modified:
nixos/trunk/modules/system/boot/stage-2-init.sh
Modified: nixos/trunk/modules/system/boot/stage-2-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2-init.sh Fri Mar 2 12:38:22
2012 (r32739)
+++ nixos/trunk/modules/system/boot/stage-2-init.sh Fri Mar 2 13:17:05
2012 (r32740)
@@ -57,6 +57,7 @@
# Process the kernel command line.
+debug2=
for o in $(cat /proc/cmdline); do
case $o in
debugtrace)
@@ -64,8 +65,7 @@
set -x
;;
debug2)
- echo "Debug shell called from @out@"
- exec @shell@
+ debug2=1
;;
S|s|single)
# !!! argh, can't pass a startup event to Upstart yet.
@@ -166,7 +166,10 @@
# For debugging Upstart.
-#@shell@ --login < /dev/console > /dev/console 2>&1 &
+if [ -n "$debug2" ]; then
+ echo "Debug shell called from @out@"
+ @shell@
+fi
# Start Upstart's init.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
