diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18 02:10:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18 02:10:39 +0000 |
| commit | 86d8d62d16edb4c66072eda6fc31fcaba02cacd2 (patch) | |
| tree | 66f14b51ffc352102f1803143ccf3e86176e5304 /modules/services/x11/xserver.nix | |
| parent | 3495a773f947105b88f375b525e3045b518443f9 (diff) | |
| download | nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar.gz nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar.bz2 nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar.lz nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar.xz nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.tar.zst nixlib-86d8d62d16edb4c66072eda6fc31fcaba02cacd2.zip | |
* Allow Upstart jobs to declare that they shouldn't be restarted by
switch-to-configuration. E.g. the X server shouldn't be restarted because that kills all the X clients. svn path=/nixos/trunk/; revision=33223
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index da29faabcfd9..3664264cbc3e 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -392,7 +392,9 @@ in }; jobs.xserver = - { environment = + { restartIfChanged = false; + + environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. TZ = config.time.timeZone; |