summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2021-09-29 18:30:50 -0400
committerGitHub <noreply@github.com>2021-09-29 18:30:50 -0400
commiteaf85fe8c7c036676fc4975452198bcfa1f9e311 (patch)
tree5cdfc54203989842ae24e056d25d6781c08ebda5 /nixos/modules
parent90d31cc53de6bf01d0e0cea85c44468a01c92344 (diff)
parent110165b784c838a46ac9ab8d6d300e7d3981b1a3 (diff)
downloadnixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar.gz
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar.bz2
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar.lz
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar.xz
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.tar.zst
nixpkgs-eaf85fe8c7c036676fc4975452198bcfa1f9e311.zip
Merge pull request #139957 from samueldr/fix/126289-regression
Provide submodule to `security.wrappers` for older kernels
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/tasks/network-interfaces.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index d934e3cf022..34a44b383a4 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1139,10 +1139,12 @@ in
         source = "${pkgs.iputils.out}/bin/ping";
       };
     } else {
-      setuid = true;
-      owner = "root";
-      group = "root";
-      source = "${pkgs.iputils.out}/bin/ping";
+      ping = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${pkgs.iputils.out}/bin/ping";
+      };
     };
     security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter ''
       /run/wrappers/bin/ping {