* dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than   ${configDir}/system.conf.  This is necessary to enable dbus to   reload its configuration on SIGHUP after a nixos-rebuild.  (The   daemon cannot be restarted because then console-kit-daemon loses its   state.) * Generate a proper /etc/dbus-1/session.conf.
* dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than
  ${configDir}/system.conf.  This is necessary to enable dbus to
  reload its configuration on SIGHUP after a nixos-rebuild.  (The
  daemon cannot be restarted because then console-kit-daemon loses its
  state.)
* Generate a proper /etc/dbus-1/session.conf.

svn path=/nixos/trunk/; revision=22572

NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixos,SymbiFlow/nixpkgs,rbvermaa/nixos-svn,andreassalomonsson/nixos,SymbiFlow/nixpkgs,SymbiFlow/nixpkgs,SymbiFlow/nixpkgs,triton/triton,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixpkgs,triton/triton,NixOS/nixpkgs,andreassalomonsson/nixos,NixOS/nixos,SymbiFlow/nixpkgs,NixOS/nixpkgs,rbvermaa/nixos-svn,rbvermaa/nixos-svn,SymbiFlow/nixpkgs,edolstra/nixos,NixOS/nixpkgs,SymbiFlow/nixpkgs,triton/triton,edolstra/nixos,rbvermaa/nixos-svn,NixOS/nixos,andreassalomonsson/nixos,andreassalomonsson/nixos,NixOS/nixpkgs,NixOS/nixpkgs,triton/triton,triton/triton,andreassalomonsson/nixos,SymbiFlow/nixpkgs,edolstra/nixos,andreassalomonsson/nixos,edolstra/nixos,triton/triton,SymbiFlow/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,edolstra/nixos,SymbiFlow/nixpkgs,triton/triton,NixOS/nixos,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixos,NixOS/nixos,NixOS/nixpkgs,triton/triton,NixOS/nixpkgs