Merge master into staging-next

2021-03-16 18:18:29 +00:00
parent 6ea779b95c 5b3290333a
commit e0a6159fc6
21 changed files with 266 additions and 66 deletions
@@ -804,7 +804,7 @@ in
        ProtectControlGroups = true;
        RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
        LockPersonality = true;
-        MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
+        MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules));
        RestrictRealtime = true;
        RestrictSUIDSGID = true;
        PrivateMounts = true;