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

* mountall: Don't start the emergency shell if the X server is 

running.  The user won't see it, and the "console owner" stanza
  breaks VT switching and causes the X server to go to 100% CPU time.

svn path=/nixos/trunk/; revision=33221
This commit is contained in:
Eelco Dolstra 2012-03-18 01:44:20 +00:00
parent 876c655e61
commit 5a98d6d514
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/tasks/filesystems.nix
View File

@ -201,7 +201,15 @@ in
startOn = "mount-failed";
script =
''
[ -n "$MOUNTPOINT" ] || exit 0
# Don't start the emergency shell if the X server is
# running. The user won't see it, and the "console owner"
# stanza breaks VT switching and causes the X server to go
# to 100% CPU time.
status="$(status xserver || true)"
[[ "$status" =~ start/ ]] && exit 0
stop tty1 || true
start --no-wait emergency-shell \
DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
'';
@ -226,8 +234,6 @@ in
script =
''
[ -n "$MOUNTPOINT" ] || exit 0
exec < /dev/console > /dev/console 2>&1
cat <<EOF