From 6645929bd0a70e677cd0b6418dfa329a04483dac Mon Sep 17 00:00:00 2001 From: "P.M. Kuipers" Date: Mon, 9 Jan 2023 21:53:49 +0100 Subject: [PATCH] Switch to systemd service instead of init.d --- Makefile.am | 10 +- cfg/init.d/mediacore-hid | 163 -------------------- cfg/init.d/mediacore-hid.in | 163 -------------------- debian/postinst | 2 +- debian/prerm | 2 +- lib/systemd/system/mediacore-hid.service.in | 12 ++ 6 files changed, 20 insertions(+), 332 deletions(-) delete mode 100644 cfg/init.d/mediacore-hid delete mode 100644 cfg/init.d/mediacore-hid.in create mode 100644 lib/systemd/system/mediacore-hid.service.in diff --git a/Makefile.am b/Makefile.am index a25812f..be7d1d9 100755 --- a/Makefile.am +++ b/Makefile.am @@ -22,12 +22,12 @@ SUPPORT_SRC = src/log/log.hpp \ sbin_PROGRAMS = mediacore-hid-server EXTRA_DIST = cfg/dbus/nl.miqra.MediaCore.Hid.conf \ - cfg/init.d/mediacore-hid.in \ + lib/systemd/system/mediacore-hid.service.in \ cfg/rsyslog/syslog.MediaCore.Hid.conf \ src/mc-hid-introspect.xml -init_d_dirdir = $(sysconfdir)/init.d -init_d_dir_SCRIPTS = cfg/init.d/mediacore-hid +systemddir = /lib/systemd/system/mediacore-hid.service +systemd_SCRIPTS = lib/systemd/system/mediacore-hid.service dbus_confdir = $(sysconfdir)/dbus-1/system.d dbus_conf_DATA = cfg/dbus/nl.miqra.MediaCore.Hid.conf @@ -35,6 +35,8 @@ dbus_conf_DATA = cfg/dbus/nl.miqra.MediaCore.Hid.conf rsyslog_confdir = $(sysconfdir)/rsyslog.d rsyslog_conf_DATA = cfg/rsyslog/syslog.MediaCore.Hid.conf + + src/mc-hid-server-glue.hpp: src/mc-hid-introspect.xml dbusxx-xml2cpp $^ --adaptor=$@ @@ -51,7 +53,7 @@ mediacore_hid_server_SOURCES = src/mc-hid-server.cpp \ mediacore_hid_server_LDADD = $(DEPS_LIBS) -L/opt/vc/lib -lpthread -lrt -lgpiodcxx -lbcm_host -cfg/init.d/mediacore-hid: cfg/init.d/mediacore-hid.in +lib/systemd/system/mediacore-hid.service: lib/systemd/system/mediacore-hid.service.in cat $^ > $@ sed -i "s#@BIN_DIR@#$(bindir)#" $@ sed -i "s#@ETC_DIR@#$(sysconfdir)#" $@ diff --git a/cfg/init.d/mediacore-hid b/cfg/init.d/mediacore-hid deleted file mode 100644 index a510642..0000000 --- a/cfg/init.d/mediacore-hid +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: mediacorehid -# Required-Start: $syslog $dbus -# Required-Stop: $syslog $dbus -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Example initscript -# Description: This file should be used to construct scripts to be -# placed in /etc/init.d. -### END INIT INFO - -# Author: Miqra Engineering <@miqra.nl> -# -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="Mediacore HID interface server" -NAME=mediacore-hid-server -DAEMON=/usr/local/sbin/$NAME -DAEMON_ARGS="" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/usr/local/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -VERBOSE=yes - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. - sleep 0.3 - dbus-send --system --dest=nl.miqra.MediaCore.Hid --type=method_call /nl/miqra/MediaCore/Hid nl.miqra.MediaCore.Hid.SetColor byte:128 byte:0 byte:0 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/cfg/init.d/mediacore-hid.in b/cfg/init.d/mediacore-hid.in deleted file mode 100644 index d97839b..0000000 --- a/cfg/init.d/mediacore-hid.in +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: mediacorehid -# Required-Start: $syslog $dbus -# Required-Stop: $syslog $dbus -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Example initscript -# Description: This file should be used to construct scripts to be -# placed in /etc/init.d. -### END INIT INFO - -# Author: Miqra Engineering <@miqra.nl> -# -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="Mediacore HID interface server" -NAME=mediacore-hid-server -DAEMON=@SBIN_DIR@/$NAME -DAEMON_ARGS="" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=@ETC_DIR@/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -VERBOSE=yes - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. - sleep 0.3 - dbus-send --system --dest=nl.miqra.MediaCore.Hid --type=method_call /nl/miqra/MediaCore/Hid nl.miqra.MediaCore.Hid.SetColor byte:128 byte:0 byte:0 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/postinst b/debian/postinst index 297f9e4..281045c 100644 --- a/debian/postinst +++ b/debian/postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) - update-rc.d mediacore-hid defaults + systemctl enable mediacore-hid.service ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/prerm b/debian/prerm index d3cf18b..26f1cf7 100644 --- a/debian/prerm +++ b/debian/prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - update-rc.d -f mediacore-hid remove + systemctl disable mediacore-hid.service ;; failed-upgrade) diff --git a/lib/systemd/system/mediacore-hid.service.in b/lib/systemd/system/mediacore-hid.service.in new file mode 100644 index 0000000..5a71167 --- /dev/null +++ b/lib/systemd/system/mediacore-hid.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=Mediacore HID interface server +After=dbus.service + + +[Service] +Type=dbus +ExecStart=@SBIN_DIR@/$NAME +BusName=nl.miqra.MediaCore.Hid + +[Install] +WantedBy=multi-user.target