Get rid of extraSetuidPrograms.
Also state in description that it is obsolete. svn path=/nixos/trunk/; revision=21777
This commit is contained in:
parent
03caab4572
commit
7ae39feedb
@ -32,13 +32,12 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
# !!! obsolete
|
||||
security.extraSetuidPrograms = mkOption {
|
||||
default = [];
|
||||
example = ["fusermount"];
|
||||
description = ''
|
||||
This option lists additional programs that must be made setuid
|
||||
root.
|
||||
root. Obsolete, use setuidPrograms instead.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -51,7 +51,7 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
security.extraSetuidPrograms = [ "sudo" ];
|
||||
security.setuidPrograms = [ "sudo" ];
|
||||
|
||||
environment.systemPackages = [ sudo ];
|
||||
|
||||
|
@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) {
|
||||
};
|
||||
};
|
||||
|
||||
security = {
|
||||
extraSetuidPrograms = [
|
||||
"kcheckpass"
|
||||
];
|
||||
};
|
||||
security.setuidPrograms = [ "kcheckpass" ];
|
||||
|
||||
environment = {
|
||||
kdePackages = [
|
||||
|
Loading…
Reference in New Issue
Block a user