From 39a8188b4a0b9ec26c4240df9ba557768ece4c48 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Aug 2020 14:43:37 +0200
Subject: Add support for Ubuntu 20.04 (TODO: systemd)

---
 core/modules/polkit/module.conf.ubuntu    |  3 +--
 core/modules/polkit/module.conf.ubuntu.18 | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 core/modules/polkit/module.conf.ubuntu.18

(limited to 'core/modules/polkit')

diff --git a/core/modules/polkit/module.conf.ubuntu b/core/modules/polkit/module.conf.ubuntu
index 27af83af..a4abcf92 100644
--- a/core/modules/polkit/module.conf.ubuntu
+++ b/core/modules/polkit/module.conf.ubuntu
@@ -7,9 +7,8 @@ REQUIRED_CONTENT_PACKAGES="
 "
 REQUIRED_DIRECTORIES+="
 	/usr/lib/policykit-1
-	/usr${ARCH_LIB_DIR}/polkit-1
 	/var/lib/polkit-1
-	/etc/dbus-1/system.d
+	/usr/share/dbus-1/system.d
 "
 # Module specific: Root of dirstructs we need directly from system
 REQUIRED_DIR_STRUCT="
diff --git a/core/modules/polkit/module.conf.ubuntu.18 b/core/modules/polkit/module.conf.ubuntu.18
new file mode 100644
index 00000000..27af83af
--- /dev/null
+++ b/core/modules/polkit/module.conf.ubuntu.18
@@ -0,0 +1,19 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES=""
+#	libmozjs185-1.0
+REQUIRED_CONTENT_PACKAGES="
+	policykit-1
+	policykit-desktop-privileges
+"
+REQUIRED_DIRECTORIES+="
+	/usr/lib/policykit-1
+	/usr${ARCH_LIB_DIR}/polkit-1
+	/var/lib/polkit-1
+	/etc/dbus-1/system.d
+"
+# Module specific: Root of dirstructs we need directly from system
+REQUIRED_DIR_STRUCT="
+	/var/lib/polkit-1
+	/etc/polkit-1
+"
+
-- 
cgit v1.2.3-55-g7522