make init scripts compatible with Ubuntu 8.04

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
bareos · Feb 17, 2015 · 7313be5 · 7313be5
1 parent 34a1211
commit 7313be5
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 3 deletions.
diff --git a/debian/bareos-director.bareos-dir.init.in b/debian/bareos-director.bareos-dir.init.in
@@ -44,6 +44,42 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
+# workaround, if status_of_proc is not defined (Ubuntu 8.04)
+if ! type status_of_proc >/dev/null; then
+status_of_proc ()
+{
+    local pidfile daemon name status OPTIND
+
+    pidfile=
+    OPTIND=1
+    while getopts p: opt ; do
+        case "$opt" in
+            p)  pidfile="$OPTARG";;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    if [ -n "$pidfile" ]; then
+        pidfile="-p $pidfile"
+    fi
+    daemon="$1"
+    name="$2"
+
+    status="0"
+    pidofproc $pidfile $daemon >/dev/null || status="$?"
+    if [ "$status" = 0 ]; then
+        log_success_msg "$name is running"
+        return 0
+    elif [ "$status" = 4 ]; then
+        log_failure_msg "could not access PID file for $name"
+        return $status
+    else
+        log_failure_msg "$name is not running"
+        return $status
+    fi
+}
+fi
+
 #
 # Function that checks if the configuration is OK and
 # the Database can be connected
@@ -118,7 +154,8 @@ do_stop()
 do_check()
 {
     STATUS=2
-    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" -s "TCP:LISTEN" >/dev/null && STATUS=0
+    # Ubuntu 8.04 does not support "lsof -s "TCP:LISTEN", therefore "grep '(LISTEN)'" is used
+    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" | grep --quiet '(LISTEN)' && STATUS=0
     return $STATUS
 }
 

diff --git a/debian/bareos-filedaemon.bareos-fd.init.in b/debian/bareos-filedaemon.bareos-fd.init.in
@@ -45,6 +45,42 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
+# workaround, if status_of_proc is not defined (Ubuntu 8.04)
+if ! type status_of_proc >/dev/null; then
+status_of_proc ()
+{
+    local pidfile daemon name status OPTIND
+
+    pidfile=
+    OPTIND=1
+    while getopts p: opt ; do
+        case "$opt" in
+            p)  pidfile="$OPTARG";;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    if [ -n "$pidfile" ]; then
+        pidfile="-p $pidfile"
+    fi
+    daemon="$1"
+    name="$2"
+
+    status="0"
+    pidofproc $pidfile $daemon >/dev/null || status="$?"
+    if [ "$status" = 0 ]; then
+        log_success_msg "$name is running"
+        return 0
+    elif [ "$status" = 4 ]; then
+        log_failure_msg "could not access PID file for $name"
+        return $status
+    else
+        log_failure_msg "$name is not running"
+        return $status
+    fi
+}
+fi
+
 #
 # Function that starts the daemon/service
 #
@@ -103,7 +139,8 @@ do_stop()
 do_check()
 {
     STATUS=2
-    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" -s "TCP:LISTEN" >/dev/null && STATUS=0
+    # Ubuntu 8.04 does not support "lsof -s "TCP:LISTEN", therefore "grep '(LISTEN)'" is used
+    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" | grep --quiet '(LISTEN)' && STATUS=0
     return $STATUS
 }
 

diff --git a/debian/bareos-storage.bareos-sd.init.in b/debian/bareos-storage.bareos-sd.init.in
@@ -42,6 +42,42 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
+# workaround, if status_of_proc is not defined (Ubuntu 8.04)
+if ! type status_of_proc >/dev/null; then
+status_of_proc ()
+{
+    local pidfile daemon name status OPTIND
+
+    pidfile=
+    OPTIND=1
+    while getopts p: opt ; do
+        case "$opt" in
+            p)  pidfile="$OPTARG";;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    if [ -n "$pidfile" ]; then
+        pidfile="-p $pidfile"
+    fi
+    daemon="$1"
+    name="$2"
+
+    status="0"
+    pidofproc $pidfile $daemon >/dev/null || status="$?"
+    if [ "$status" = 0 ]; then
+        log_success_msg "$name is running"
+        return 0
+    elif [ "$status" = 4 ]; then
+        log_failure_msg "could not access PID file for $name"
+        return $status
+    else
+        log_failure_msg "$name is not running"
+        return $status
+    fi
+}
+fi
+
 #
 # Function that starts the daemon/service
 #
@@ -100,7 +136,8 @@ do_stop()
 do_check()
 {
     STATUS=2
-    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" -s "TCP:LISTEN" >/dev/null && STATUS=0
+    # Ubuntu 8.04 does not support "lsof -s "TCP:LISTEN", therefore "grep '(LISTEN)'" is used
+    pidofproc -p $PIDFILE $DAEMON >/dev/null && lsof -i "TCP:${NETWORK_PORT}" | grep --quiet '(LISTEN)' && STATUS=0
     return $STATUS
 }