Get rid of extraSetuidPrograms.

Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
This commit is contained in:
Yury G. Kudryashov 2010-05-14 21:01:06 +00:00
parent 03caab4572
commit 7ae39feedb
3 changed files with 3 additions and 8 deletions

View file

@ -32,13 +32,12 @@ in
''; '';
}; };
# !!! obsolete
security.extraSetuidPrograms = mkOption { security.extraSetuidPrograms = mkOption {
default = []; default = [];
example = ["fusermount"]; example = ["fusermount"];
description = '' description = ''
This option lists additional programs that must be made setuid This option lists additional programs that must be made setuid
root. root. Obsolete, use setuidPrograms instead.
''; '';
}; };

View file

@ -51,7 +51,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
security.extraSetuidPrograms = [ "sudo" ]; security.setuidPrograms = [ "sudo" ];
environment.systemPackages = [ sudo ]; environment.systemPackages = [ sudo ];

View file

@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) {
}; };
}; };
security = { security.setuidPrograms = [ "kcheckpass" ];
extraSetuidPrograms = [
"kcheckpass"
];
};
environment = { environment = {
kdePackages = [ kdePackages = [