Make sure pam_ck_connector is required by and included in the consolekit module on all platforms

(Previously it was in consolekit on suse and pam on ubuntu... -.-)

8 files changed, 42 insertions, 8 deletions

diff --git a/remote/modules/consolekit/consolekit.build b/remote/modules/consolekit/consolekit.build
index ac31f9ed..0c63ec6b 100644
--- a/remote/modules/consolekit/consolekit.build
+++ b/remote/modules/consolekit/consolekit.build
@@ -10,11 +10,19 @@ build() {
 
         list_packet_files >> "${COPYLIST}"
 	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
-	
+	# Systemd/dbus
+	mkdir -p "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services" "$MODULE_BUILD_DIR/etc/systemd/system"
+	local DAEMON=$(find "$MODULE_BUILD_DIR" -name console-kit-daemon -executable | head -n 1)
+	DAEMON="${DAEMON#$MODULE_BUILD_DIR}"
+	[ -z "$DAEMON" ] && perror "Could not find console-kit-daemon binary"
+	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.systemd.service" > "$MODULE_BUILD_DIR/etc/systemd/system/console-kit-daemon.service" || perror "Could not generate systemd service"
+	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.dbus.service" > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service" || perror "Could not generate dbus service"
 }
+
 post_copy() {
 	mkdir -p "${TARGET_BUILD_DIR}/usr/lib/ConsoleKit/run-seat.d"
 	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-seat.d"
 	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-session.d"
 	mkdir -p "${TARGET_BUILD_DIR}/var/log/ConsoleKit"
 }
+
diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
index 91fc6dc2..b84bf697 100644
--- a/remote/modules/consolekit/consolekit.conf
+++ b/remote/modules/consolekit/consolekit.conf
@@ -1,12 +1,16 @@
 REQUIRED_BINARIES="
 	console-kit-daemon
+	ck-history
+	ck-launch-session
+	ck-list-sessions
 "
 REQUIRED_DIRECTORIES="
-	/usr
-	/etc
-	/$LIB64
+	/etc/ConsoleKit
+	/etc/dbus-1
+	/usr/share
 "
 REQUIRED_LIBRARIES="
 	pam_ck_connector
+	libck-connector
 "
 
diff --git a/remote/modules/consolekit/consolekit.conf.debian b/remote/modules/consolekit/consolekit.conf.debian
index c0fffffa..0171868a 100644
--- a/remote/modules/consolekit/consolekit.conf.debian
+++ b/remote/modules/consolekit/consolekit.conf.debian
@@ -1,2 +1,6 @@
-REQUIRED_CONTENT_PACKAGES="consolekit"
+REQUIRED_CONTENT_PACKAGES="
+	consolekit
+	libpam-ck-connector
+"
+
 
diff --git a/remote/modules/consolekit/consolekit.conf.ubuntu b/remote/modules/consolekit/consolekit.conf.ubuntu
index c0fffffa..3b160bc9 100644
--- a/remote/modules/consolekit/consolekit.conf.ubuntu
+++ b/remote/modules/consolekit/consolekit.conf.ubuntu
@@ -1,2 +1,6 @@
-REQUIRED_CONTENT_PACKAGES="consolekit"
+REQUIRED_CONTENT_PACKAGES="
+	consolekit
+	libpam-ck-connector
+	libck-connector0
+"
 
diff --git a/remote/modules/consolekit/templates/consolekit.dbus.service b/remote/modules/consolekit/templates/consolekit.dbus.service
new file mode 100644
index 00000000..5720e4cf
--- /dev/null
+++ b/remote/modules/consolekit/templates/consolekit.dbus.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=org.freedesktop.ConsoleKit
+Exec=%DAEMON% --no-daemon
+User=root
+SystemdService=console-kit-daemon.service
+
diff --git a/remote/modules/consolekit/templates/consolekit.systemd.service b/remote/modules/consolekit/templates/consolekit.systemd.service
new file mode 100644
index 00000000..f86158cc
--- /dev/null
+++ b/remote/modules/consolekit/templates/consolekit.systemd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=ConsoleKit (Legacy)
+After=syslog.target
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.ConsoleKit
+ExecStart=%DAEMON% --no-daemon
+
diff --git a/remote/modules/pam/pam.conf.ubuntu b/remote/modules/pam/pam.conf.ubuntu
index c1516e13..fe034225 100644
--- a/remote/modules/pam/pam.conf.ubuntu
+++ b/remote/modules/pam/pam.conf.ubuntu
@@ -14,7 +14,6 @@ REQUIRED_INSTALLED_PACKAGES="
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
 	libpam-modules
-	libpam-ck-connector
 	libpam-cap
 	libldap-2.4-2
 	libpam-ldap
diff --git a/remote/setup_target b/remote/setup_target
index 2f4d6e37..dc8bd151 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -338,7 +338,7 @@ process_module() {
 		[ -d "${TARGET_BUILD_DIR}" ] && TARGET_BUILD_SIZE=$(du -bc "${TARGET_BUILD_DIR}" | awk 'END {print $1}') || TARGET_BUILD_SIZE=0
 		pinfo "## Copying files with dependencies"
 		copy_files_with_deps
-		pinfo "## Copying required system files"
+		pinfo "## Copying required system files" # REQUIRED_SYSTEM_FILES
 		copy_system_files
 		pinfo "## Copying static module files"
 		copy_static_data