From 908612adf85c8f3d25109a697613672f178db3ea Mon Sep 17 00:00:00 2001 From: penfold42 Date: Sun, 3 Apr 2016 00:05:46 +1100 Subject: [PATCH] init scripts need to send SIGTERM not SIGHUP * Removed -HUP so the default -TERM signal is sent instead. - hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config Changed pgrep to add '-x' so it wont partial match on the exe name. - I have multiple instances with multiple hyperiond-instance1 names - this ensures the service script only kills the right process * reversing errant change to hyperion.systemd.sh Former-commit-id: 7df14c9ab31bd808df7f286a8db89de3ac7d18bd --- bin/service/hyperion.init.sh | 5 ++--- bin/service/hyperion.systemd.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/service/hyperion.init.sh b/bin/service/hyperion.init.sh index 3cd0723d..ca3f8d14 100644 --- a/bin/service/hyperion.init.sh +++ b/bin/service/hyperion.init.sh @@ -22,7 +22,7 @@ PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME case "$1" in start) - if [ $(pgrep -l $NAME |wc -l) = 1 ] + if [ $(pgrep -xl $NAME |wc -l) = 1 ] then printf "%-50s\n" "Already running..." exit 1 @@ -59,8 +59,7 @@ stop) PID=`cat $PIDFILE` cd $DAEMON_PATH if [ -f $PIDFILE ]; then - hyperion-remote -c black - kill -HUP $PID + kill $PID printf "%s\n" "Ok" rm -f $PIDFILE else diff --git a/bin/service/hyperion.systemd.sh b/bin/service/hyperion.systemd.sh index 005c0c14..c3c66255 100644 --- a/bin/service/hyperion.systemd.sh +++ b/bin/service/hyperion.systemd.sh @@ -12,4 +12,4 @@ Restart=on-failure TimeoutStopSec=10 [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target