* Use boot.kernelModules everywhere instead of explicit calls to

  modprobe.
* Move the implementation of boot.kernelModules from the udev job to
  the activation script.  This prevents races with the udev job.
* Drop references to the "capability" kernel module, which no longer
  exists.

svn path=/nixos/trunk/; revision=33208

1 files changed, 2 insertions, 6 deletions

diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index 443328f67b0b..89c40c531579 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -10,8 +10,6 @@ let
 
   privoxyUser = "privoxy";
 
-  modprobe = config.system.sbin.modprobe;
-
   privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}";
 
   privoxyCfg = pkgs.writeText "privoxy.conf" ''
@@ -68,12 +66,13 @@ in
   ###### implementation
 
   config = mkIf config.services.privoxy.enable {
+  
     environment.systemPackages = [ privoxy ];
 
     users.extraUsers = singleton
       { name = privoxyUser;
         uid = config.ids.uids.privoxy;
-        description = "privoxy daemon user";
+        description = "Privoxy daemon user";
         home = stateDir;
       };
 
@@ -86,9 +85,6 @@ in
           ''
             mkdir -m 0755 -p ${stateDir}
             chown ${privoxyUser} ${stateDir}
-
-            # Needed to run privoxy as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
           '';
 
         exec = "${privoxy}/sbin/privoxy ${privoxyFlags}";