From fc004e746fb90ef4cdd6b65bf239b8a39260d9ac Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 May 2018 11:15:16 +0100
Subject: [PATCH] Ensure that the avahi daemon keeps running

---
 src/freedombone-utils-avahi | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index 86adcc7b..7ab0918d 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -111,7 +111,7 @@ function mesh_avahi {
     WATCHDOG_SCRIPT_NAME="keepon"
     { echo '';
       echo '# keep avahi daemon running';
-      echo "AVAHI_RUNNING=\$(pgrep avahi-daemon > /dev/null && echo Running)";
+      echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
       echo "if [ ! \$AVAHI_RUNNING ]; then";
       echo '  systemctl start avahi-daemon';
       echo "  echo -n \$CURRENT_DATE >> \$LOGFILE";
@@ -150,6 +150,25 @@ function install_avahi {
     sed -i 's|#domain-name=.*|domain-name=local|g' /etc/avahi/avahi-daemon.conf
     sed -i 's|domain-name=.*|domain-name=local|g' /etc/avahi/avahi-daemon.conf
 
+    # keep the daemon running
+    WATCHDOG_SCRIPT_NAME="keepon"
+    if [ ! -f "/usr/bin/$WATCHDOG_SCRIPT_NAME" ]; then
+        { echo '#!/bin/bash';
+          echo 'LOGFILE=/var/log/keepon.log';
+          echo "CURRENT_DATE=\$(date)"; } > "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+    fi
+
+    { echo '';
+      echo '# keep avahi daemon running';
+      echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
+      echo "if [ ! \$AVAHI_RUNNING ]; then";
+      echo '  systemctl start avahi-daemon';
+      echo "  echo -n \$CURRENT_DATE >> \$LOGFILE";
+      echo "  echo \" Avahi daemon restarted\" >> \$LOGFILE";
+      echo 'fi';
+      echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+    chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+
     mark_completed "${FUNCNAME[0]}"
 }