diff options
-rwxr-xr-x | data/ConsoleKit.in | 70 | ||||
-rw-r--r-- | data/Makefile.am | 15 |
2 files changed, 1 insertions, 84 deletions
diff --git a/data/ConsoleKit.in b/data/ConsoleKit.in deleted file mode 100755 index 83360cd..0000000 --- a/data/ConsoleKit.in +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# -# ConsoleKit: ConsoleKit daemon -# -# chkconfig: 345 90 10 -# description: The ConsoleKit maintains a list of sessions -# -# processname: console-kit-daemon -# pidfile: @CONSOLE_KIT_PID_FILE@ -# - -# Sanity checks. -[ -x @sbindir@/console-kit-daemon ] || exit 0 - -# Source function library. -. @sysconfdir@/rc.d/init.d/functions - -# so we can rearrange this easily -processname=console-kit-daemon -servicename=ConsoleKit - -RETVAL=0 - -start() { - echo -n $"Starting ConsoleKit: " - daemon --check $servicename $processname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$servicename -} - -stop() { - echo -n $"Stopping ConsoleKit: " - - killproc $processname -TERM - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f @localstatedir@/lock/subsys/$servicename - rm -f @CONSOLE_KIT_PID_FILE@ - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $processname - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f @localstatedir@/lock/subsys/$servicename ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - ;; -esac -exit $RETVAL diff --git a/data/Makefile.am b/data/Makefile.am index 9516c3b..e2a237b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,15 +6,6 @@ dbusconf_DATA = ConsoleKit.conf seatdir = $(sysconfdir)/ConsoleKit/seats.d seat_DATA = 00-primary.seat -SCRIPT_IN_FILES = ConsoleKit.in - -# I guess it's Linux-only but that will do for the moment. -if ! CK_COMPILE_FREEBSD -initddir=$(sysconfdir)/rc.d/init.d -initd_SCRIPTS= \ - ConsoleKit \ - $(NULL) -endif servicedir = $(datadir)/dbus-1/system-services service_in_files = org.freedesktop.ConsoleKit.service.in @@ -23,9 +14,6 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile $(edit) $< >$@ -ConsoleKit: ConsoleKit.in Makefile - $(edit) $< >$@ - edit = sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ @@ -35,7 +23,6 @@ edit = sed \ EXTRA_DIST = \ $(dbusconf_DATA) \ $(seat_DATA) \ - $(SCRIPT_IN_FILES) \ $(service_in_files) \ $(NULL) @@ -43,4 +30,4 @@ MAINTAINERCLEANFILES = \ *~ \ Makefile.in -CLEANFILES = ConsoleKit $(service_DATA) +CLEANFILES = $(service_DATA) |