- now working

Changed files:
    doldaconnect.init -> 1.2

diff --git a/doldaconnect.init b/doldaconnect.init
index e1eb9ca4cc4817762b4e178a24f2e7e8ab4d53a4..8baca30098a1e836d881431197a4d274f85cac55 100755 (executable)
--- a/doldaconnect.init
+++ b/doldaconnect.init
@@ -18,13 +18,9 @@ if [ -f /etc/sysconfig/doldacond ]; then
 fi
 
 # Check that networking is up.
-if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down doldacon
-               exit 1
-       fi
-else
-       exit 0
+if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+       msg_network_down doldacon
+       exit 1
 fi
 
 # See how we were called.
@@ -33,7 +29,7 @@ case "$1" in
                # Check if service is already running?
                if [ ! -f /var/lock/subsys/doldacond ]; then
                        msg_starting doldacond
-                       daemon doldacond -p /var/run/doldacond.pid ${ADD_OPT}
+                       daemon doldacond -C /etc/doldaconnect/doldacond.conf -p /var/run/doldacond.pid ${ADD_OPT}
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/doldacond
                else
@@ -43,7 +39,7 @@ case "$1" in
        stop)
                if [ -f /var/lock/subsys/doldacond ]; then
                        msg_stopping doldacond
-                       killproc doldacond --pidfile /var/run/doldacond.pid
+                       killproc --pidfile /var/run/doldacond.pid doldacond
                        rm -f /var/lock/subsys/doldacond
                else
                        msg_not_running doldacond
@@ -56,7 +52,7 @@ case "$1" in
        reload)
                if [ -f /var/lock/subsys/doldacond ]; then
                        msg_reloading doldacond
-                       killproc doldacond -HUP
+                       killproc --pidfile /var/run/doldacond.pid doldacond -HUP
                        RETVAL=$?
                else
                        msg_not_running doldacond >&2