From 7ae39feedbe7dcf31ced3a4a744e29057e87301f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 14 May 2010 21:01:06 +0000 Subject: [PATCH] Get rid of extraSetuidPrograms. Also state in description that it is obsolete. svn path=/nixos/trunk/; revision=21777 --- modules/security/setuid-wrappers.nix | 3 +-- modules/security/sudo.nix | 2 +- modules/services/x11/desktop-managers/kde.nix | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix index 5450bbb7bab..510c99b2f58 100644 --- a/modules/security/setuid-wrappers.nix +++ b/modules/security/setuid-wrappers.nix @@ -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. ''; }; diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix index e911a257bbf..845371050cc 100644 --- a/modules/security/sudo.nix +++ b/modules/security/sudo.nix @@ -51,7 +51,7 @@ in config = mkIf cfg.enable { - security.extraSetuidPrograms = [ "sudo" ]; + security.setuidPrograms = [ "sudo" ]; environment.systemPackages = [ sudo ]; diff --git a/modules/services/x11/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix index 45c4c464f9a..442a79fde4f 100644 --- a/modules/services/x11/desktop-managers/kde.nix +++ b/modules/services/x11/desktop-managers/kde.nix @@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) { }; }; - security = { - extraSetuidPrograms = [ - "kcheckpass" - ]; - }; + security.setuidPrograms = [ "kcheckpass" ]; environment = { kdePackages = [