Author: eelco
Date: Thu Jul 15 12:31:18 2010
New Revision: 22608
URL: https://svn.nixos.org/websvn/nix/?rev=22608&sc=1
Log:
* 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.
Modified:
nixos/trunk/modules/system/activation/switch-to-configuration.sh
Modified: nixos/trunk/modules/system/activation/switch-to-configuration.sh
==============================================================================
--- nixos/trunk/modules/system/activation/switch-to-configuration.sh Thu Jul
15 11:09:30 2010 (r22607)
+++ nixos/trunk/modules/system/activation/switch-to-configuration.sh Thu Jul
15 12:31:18 2010 (r22608)
@@ -105,7 +105,9 @@
# 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..."
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
