Merge remote-tracking branch 'kali/hotfix/do-not-install-globally' into develop

2 files changed, 6 insertions, 5 deletions

diff --git a/changes/bug_3803-do-not-install-resolv-update-globally b/changes/bug_3803-do-not-install-resolv-update-globally
new file mode 100644
index 00000000..f6e06d5f
--- /dev/null
+++ b/changes/bug_3803-do-not-install-resolv-update-globally
@@ -0,0 +1 @@
+  o Do not try to install resolv-update globally. Closes: #3803
diff --git a/setup.py b/setup.py
index 5099c1b1..88cb0e40 100755
--- a/setup.py
+++ b/setup.py
@@ -135,17 +135,17 @@ import platform
 _system = platform.system()
 IS_LINUX = True if _system == "Linux" else False
 
+data_files = []
+
 if IS_LINUX:
+    # XXX use check_for_permissions to install data
+    # globally. See #3805
     data_files = [
-        # ("share/man/man1",
-        #     ["docs/man/bitmask.1"]),
         ("share/polkit-1/actions",
          ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]),
-        ("/etc/leap/",
+        ("etc/leap/",
          ["pkg/linux/resolv-update"]),
     ]
-else:
-    data_files = []
 
 setup(
     name="leap.bitmask",