Author: eelco
Date: Tue Jul 26 18:34:10 2011
New Revision: 27968
URL: https://svn.nixos.org/websvn/nix/?rev=27968&sc=1
Log:
* Move PulseAudio initialisation below the re-exec to prevent it from
being started twice.
Modified:
nixos/trunk/modules/services/x11/display-managers/default.nix
Modified: nixos/trunk/modules/services/x11/display-managers/default.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/default.nix Tue Jul
26 18:16:24 2011 (r27967)
+++ nixos/trunk/modules/services/x11/display-managers/default.nix Tue Jul
26 18:34:10 2011 (r27968)
@@ -57,6 +57,9 @@
exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi
+ # Handle being called by kdm.
+ if test "''${1:0:1}" = /; then eval exec "$1"; fi
+
# Start PulseAudio if enabled.
${optionalString config.hardware.pulseaudio.enable ''
${pkgs.pulseaudio}/bin/pulseaudio --start
@@ -68,9 +71,6 @@
${pkgs.pulseaudio}/bin/pactl load-module module-device-manager
"do_routing=1"
''}
- # Handle being called by kdm.
- if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
# Load X defaults.
if test -e ~/.Xdefaults; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
