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

* Run the stage 2 debug shell at a more useful point (just before

Browse Source 
starting Upstart).  This also causes $PATH to be set to something
  more sensible.

svn path=/nixos/trunk/; revision=32740
This commit is contained in:
Eelco Dolstra 2012-03-02 13:17:05 +00:00
parent 29d84af677
commit f61ad97833
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/system/boot/stage-2-init.sh
View File

@ -57,6 +57,7 @@ cat /proc/mounts > /etc/mtab
# Process the kernel command line. # Process the kernel command line.
debug2=
for o in $(cat /proc/cmdline); do for o in $(cat /proc/cmdline); do
case $o in case $o in
debugtrace) debugtrace)
@ -64,8 +65,7 @@ for o in $(cat /proc/cmdline); do
set -x set -x
;; ;;
debug2) debug2)
echo "Debug shell called from @out@" debug2=1
exec @shell@
;; ;;
S|s|single) S|s|single)
# !!! argh, can't pass a startup event to Upstart yet. # !!! argh, can't pass a startup event to Upstart yet.
@ -166,7 +166,10 @@ export MODULE_DIR=@kernel@/lib/modules/
# For debugging Upstart. # 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. # Start Upstart's init.