summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-05-20 01:01:42 +0200
committerGitHub <noreply@github.com>2018-05-20 01:01:42 +0200
commitf4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5 (patch)
treed9507a094a1ee3ad79992d672262867ca403989c /nixos
parent8bcec815bdecdb7a6094ec538860c08b23410378 (diff)
downloadnixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar.gz
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar.bz2
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar.lz
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar.xz
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.tar.zst
nixpkgs-f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5.zip
nixos/cjdns: fix service for i686 (#40740)
service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/cjdns.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 12c2677c336..39b62bdc709 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -260,7 +260,8 @@ in
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
-        MemoryDenyWriteExecute = true;
+        # Doesn't work on i686, causing service to fail
+        MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
         ProtectHome = true;
         PrivateTmp = true;
       };