From f3e16077589c5dfa0319b46fb4240bdca2ce6934 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Jul 2010 12:31:18 +0000 Subject: [PATCH] * Don't run the emergency-shell task after nixos-rebuild because it 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 --- modules/system/activation/switch-to-configuration.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh index c741aeccdaca..ccb3d230e8db 100644 --- a/modules/system/activation/switch-to-configuration.sh +++ b/modules/system/activation/switch-to-configuration.sh @@ -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..."