From bae5ec1ed4ca07b552d6523e424a0ace5fa86933 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 3 Sep 2013 17:42:51 +0200
Subject: Add consolekit and polkit

---
 remote/modules/consolekit/consolekit.conf          | 23 +++++++++++-----------
 remote/modules/consolekit/consolekit.conf.opensuse |  2 ++
 remote/modules/consolekit/consolekit.conf.ubuntu   |  2 ++
 remote/modules/consolekit/consolekit.conf.zypper   | 11 -----------
 .../basic.target.wants/console-kit-daemon.service  |  1 +
 .../etc/systemd/system/console-kit-daemon.service  |  8 ++++++++
 .../org.freedesktop.ConsoleKit.service             |  6 ++++++
 7 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 remote/modules/consolekit/consolekit.conf.opensuse
 create mode 100644 remote/modules/consolekit/consolekit.conf.ubuntu
 delete mode 100644 remote/modules/consolekit/consolekit.conf.zypper
 create mode 120000 remote/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service
 create mode 100644 remote/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service
 create mode 100644 remote/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service

(limited to 'remote/modules/consolekit')

diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
index afb573ce..4f128c62 100644
--- a/remote/modules/consolekit/consolekit.conf
+++ b/remote/modules/consolekit/consolekit.conf
@@ -1,11 +1,12 @@
-REQUIRED_CONTENT_PACKAGES="consolekit"
-REQUIRED_BINARIES="	ck-history
-			ck-launch-session
-			ck-list-sessions
-			ck-log-system-start
-			ck-log-system-restart
-			ck-log-system-stop
-			console-kit-daemon"
-REQUIRED_DIRECTORIES="	/usr/lib/ConsoleKit /etc /lib/systemd/system"
-REQUIRED_FILES="	/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-			/usr/share/polkit-1/actions/org.freedesktop.consolekit.policy"
+REQUIRED_BINARIES="
+	console-kit-daemon
+"
+REQUIRED_DIRECTORIES="
+	/usr
+	/etc
+	/lib
+"
+REQUIRED_LIBRARIES="
+	pam_ck_connector
+"
+
diff --git a/remote/modules/consolekit/consolekit.conf.opensuse b/remote/modules/consolekit/consolekit.conf.opensuse
new file mode 100644
index 00000000..74c694a1
--- /dev/null
+++ b/remote/modules/consolekit/consolekit.conf.opensuse
@@ -0,0 +1,2 @@
+REQUIRED_CONTENT_PACKAGES="ConsoleKit"
+
diff --git a/remote/modules/consolekit/consolekit.conf.ubuntu b/remote/modules/consolekit/consolekit.conf.ubuntu
new file mode 100644
index 00000000..c0fffffa
--- /dev/null
+++ b/remote/modules/consolekit/consolekit.conf.ubuntu
@@ -0,0 +1,2 @@
+REQUIRED_CONTENT_PACKAGES="consolekit"
+
diff --git a/remote/modules/consolekit/consolekit.conf.zypper b/remote/modules/consolekit/consolekit.conf.zypper
deleted file mode 100644
index 394ee0da..00000000
--- a/remote/modules/consolekit/consolekit.conf.zypper
+++ /dev/null
@@ -1,11 +0,0 @@
-REQUIRED_CONTENT_PACKAGES="ConsoleKit"
-REQUIRED_BINARIES="	ck-history
-			ck-launch-session
-			ck-list-sessions
-			ck-log-system-start
-			ck-log-system-restart
-			ck-log-system-stop
-			console-kit-daemon"
-REQUIRED_DIRECTORIES="	/usr/lib/ConsoleKit /etc /lib/systemd/system"
-REQUIRED_FILES="	/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-			/usr/share/polkit-1/actions/org.freedesktop.consolekit.policy"
diff --git a/remote/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service b/remote/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service
new file mode 120000
index 00000000..2b34a3f6
--- /dev/null
+++ b/remote/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service
@@ -0,0 +1 @@
+../console-kit-daemon.service
\ No newline at end of file
diff --git a/remote/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service b/remote/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service
new file mode 100644
index 00000000..bc2a0de9
--- /dev/null
+++ b/remote/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=ConsoleKit
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.ConsoleKit
+ExecStart=/usr/sbin/console-kit-daemon --no-daemon
+
diff --git a/remote/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service b/remote/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
new file mode 100644
index 00000000..cbefc9a4
--- /dev/null
+++ b/remote/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=org.freedesktop.ConsoleKit
+Exec=/usr/sbin/console-kit-daemon --no-daemon
+User=root
+SystemdService=console-kit-daemon.service
+
-- 
cgit v1.2.3-55-g7522