mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

* Don't run the emergency-shell task after nixos-rebuild because it

Browse source 
screws up the X server (CPU usage goes to 100%, switching virtual
  consoles no longer works, etc.).  TODO: we need some generic way to
  mark jobs that shouldn't be started automatically.

svn path=/nixos/trunk/; revision=22608
This commit is contained in:
Eelco Dolstra 2010-07-15 12:31:18 +00:00
parent b614179eed
commit f3e1607758
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/system/activation/switch-to-configuration.sh
View file

@ -105,7 +105,9 @@ EOF
# Another hack: don't restart the X server (that would kill all the clients).
# And don't restart dbus, since that causes ConsoleKit to
# forget about current sessions.
if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$"; then continue; fi
# Idem for the emergeny-shell, because its `console owner'
# line screws up the X server.
if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$"; then continue; fi
if ! test -e "$oldJobs/$job.conf"; then
echo "starting $job..."