Unverified Commit ea168da7 authored by Sizhe Zhao's avatar Sizhe Zhao
Browse files

firewalld: add NIX_FIREWALLD_CONFIG_PATH

parent 2b32dee3

pkgs/by-name/fi/firewalld/add-config-path-env-var.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
--- a/src/firewall/config/__init__.py.in

+++ b/src/firewall/config/__init__.py.in

@@ -80,7 +80,8 @@

     FIREWALLD_POLICIES = path + "/policies"

 

 

-set_default_config_paths("/usr/lib/firewalld")

+import os

+set_default_config_paths(os.environ.get("NIX_FIREWALLD_CONFIG_PATH", "/usr/lib/firewalld"))

 

 FIREWALLD_LOGFILE = "/var/log/firewalld"

pkgs/by-name/fi/firewalld/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec { 
  };



  patches = [

    ./add-config-path-env-var.patch

    ./respect-xml-catalog-files-var.patch

    ./specify-localedir.patch

  ];