diff options
| author | Simon Rettberg | 2013-09-18 16:42:52 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-09-30 13:26:31 +0200 |
| commit | dbb64d3f5ad154241128cb24664a5f27b0551762 (patch) | |
| tree | bec4d0f81cd89c07dc20a8b7f91b9f184318bf03 /remote/modules/consolekit | |
| parent | [blacklists] Modifications for accounts-daemon.service (diff) | |
| download | tm-scripts-dbb64d3f5ad154241128cb24664a5f27b0551762.tar.gz tm-scripts-dbb64d3f5ad154241128cb24664a5f27b0551762.tar.xz tm-scripts-dbb64d3f5ad154241128cb24664a5f27b0551762.zip | |
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... -.-)
Diffstat (limited to 'remote/modules/consolekit')
6 files changed, 41 insertions, 6 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 + |