Author: eelco
Date: Mon Aug 15 14:48:32 2011
New Revision: 28587
URL: https://svn.nixos.org/websvn/nix/?rev=28587&sc=1
Log:
* Revert r28400 because ConsoleKit got reverted to 0.4.1.
Modified:
nixos/trunk/modules/programs/shadow.nix
nixos/trunk/modules/services/x11/display-managers/auto.nix
nixos/trunk/modules/services/x11/display-managers/default.nix
nixos/trunk/modules/services/x11/display-managers/slim.nix
Modified: nixos/trunk/modules/programs/shadow.nix
==============================================================================
--- nixos/trunk/modules/programs/shadow.nix Mon Aug 15 14:47:18 2011
(r28586)
+++ nixos/trunk/modules/programs/shadow.nix Mon Aug 15 14:48:32 2011
(r28587)
@@ -75,8 +75,7 @@
security.pam.services =
[ { name = "chsh"; rootOK = true; }
{ name = "chfn"; rootOK = true; }
- # Enable ‘ownDevices’ for the services/x11/display-managers/auto.nix
module.
- { name = "su"; rootOK = true; ownDevices = true; forwardXAuth = true; }
+ { name = "su"; rootOK = true; forwardXAuth = true; }
{ name = "passwd"; }
# Note: useradd, groupadd etc. aren't setuid root, so it
# doesn't really matter what the PAM config says as long as it
Modified: nixos/trunk/modules/services/x11/display-managers/auto.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/auto.nix Mon Aug 15
14:47:18 2011 (r28586)
+++ nixos/trunk/modules/services/x11/display-managers/auto.nix Mon Aug 15
14:48:32 2011 (r28587)
@@ -52,11 +52,6 @@
'';
};
- # The ConsoleKit PAM connector launches a local session, but it's
- # not set as "active" (maybe because x11-display-device is not
- # set). Launching a child session seems to fix that.
- services.xserver.displayManager.forceCKSession = true;
-
};
}
Modified: nixos/trunk/modules/services/x11/display-managers/default.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/default.nix Mon Aug
15 14:47:18 2011 (r28586)
+++ nixos/trunk/modules/services/x11/display-managers/default.nix Mon Aug
15 14:48:32 2011 (r28587)
@@ -55,8 +55,8 @@
# Start a ConsoleKit session so that we get ownership of various
# devices.
- if [ \( -z "$XDG_SESSION_COOKIE" -o -n "${toString
cfg.displayManager.forceCKSession}" \) -a -z "$CK_STARTED" ]; then
- CK_STARTED=1 exec ${pkgs.consolekit}/bin/ck-launch-session "$0"
"$sessionType"
+ if test -z "$XDG_SESSION_COOKIE"; then
+ exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi
# Handle being called by kdm.
@@ -164,12 +164,6 @@
apply = toString;
};
- forceCKSession = mkOption {
- internal = true;
- default = false;
- description = "Whether to force launching of a ConsoleKit session.";
- };
-
session = mkOption {
default = [];
example = [
Modified: nixos/trunk/modules/services/x11/display-managers/slim.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/slim.nix Mon Aug 15
14:47:18 2011 (r28586)
+++ nixos/trunk/modules/services/x11/display-managers/slim.nix Mon Aug 15
14:48:32 2011 (r28587)
@@ -106,17 +106,8 @@
# Allow null passwords so that the user can login as root on the
# installation CD.
- security.pam.services = singleton
- { name = "slim";
- allowNullPassword = true;
- ownDevices = true;
- };
+ security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
- # The ConsoleKit PAM connector launches a local session, but it's
- # not set as "active" (maybe because x11-display-device is not
- # set). Launching a child session seems to fix that.
- services.xserver.displayManager.forceCKSession = true;
-
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
