public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Revert r28400 because ConsoleKit got reverted to 0.4.1.

Browse Source 
svn path=/nixos/trunk/; revision=28587
This commit is contained in:
Eelco Dolstra 2011-08-15 14:48:32 +00:00
parent 4bc0bfec4c
commit 4790c147bf
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/programs/shadow.nix
View File

@ -75,8 +75,7 @@ in
security.pam.services = security.pam.services =
[ { name = "chsh"; rootOK = true; } [ { name = "chsh"; rootOK = true; }
{ name = "chfn"; rootOK = true; } { name = "chfn"; rootOK = true; }
# Enable ‘ownDevices’ for the services/x11/display-managers/auto.nix module. { name = "su"; rootOK = true; forwardXAuth = true; }
{ name = "su"; rootOK = true; ownDevices = true; forwardXAuth = true; }
{ name = "passwd"; } { name = "passwd"; }
# Note: useradd, groupadd etc. aren't setuid root, so it # Note: useradd, groupadd etc. aren't setuid root, so it
# doesn't really matter what the PAM config says as long as it # doesn't really matter what the PAM config says as long as it

5
modules/services/x11/display-managers/auto.nix
View File

@ -52,11 +52,6 @@ in
''; '';
}; };
# 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;
}; };
} }

10
modules/services/x11/display-managers/default.nix
View File

@ -55,8 +55,8 @@ let
# Start a ConsoleKit session so that we get ownership of various # Start a ConsoleKit session so that we get ownership of various
# devices. # devices.
if [ \( -z "$XDG_SESSION_COOKIE" -o -n "${toString cfg.displayManager.forceCKSession}" \) -a -z "$CK_STARTED" ]; then if test -z "$XDG_SESSION_COOKIE"; then
CK_STARTED=1 exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType" exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi fi
# Handle being called by kdm. # Handle being called by kdm.
@ -164,12 +164,6 @@ in
apply = toString; apply = toString;
}; };
forceCKSession = mkOption {
internal = true;
default = false;
description = "Whether to force launching of a ConsoleKit session.";
};
session = mkOption { session = mkOption {
default = []; default = [];
example = [ example = [

11
modules/services/x11/display-managers/slim.nix
View File

@ -106,17 +106,8 @@ in
# Allow null passwords so that the user can login as root on the # Allow null passwords so that the user can login as root on the
# installation CD. # installation CD.
security.pam.services = singleton security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
{ name = "slim";
allowNullPassword = true;
ownDevices = 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;
}; };
} }