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 {
|
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.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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 ];
|
||||||
|
|
||||||
|
|
|
@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
security = {
|
security.setuidPrograms = [ "kcheckpass" ];
|
||||||
extraSetuidPrograms = [
|
|
||||||
"kcheckpass"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
kdePackages = [
|
kdePackages = [
|
||||||
|
|
Loading…
Reference in a new issue