Changeset 2191

Timestamp:

15/06/2008 20:08:30 (21 months ago)

Author:

chris

Message:

Fix default locations of PID files.

Wait for daemons to stop before starting them again during restart.

Location:

box/trunk/contrib/debian

Files:

• bbackupd.in (modified) (2 diffs)
• bbstored.in (modified) (2 diffs)

box/trunk/contrib/debian/bbackupd.in

@@ -5 +5 @@
 BBACKUPD=@sbindir_expanded@/bbackupd
 CONFIG=@sysconfdir_expanded@/box/bbackupd.conf
-PIDFILE=@localstatedir_expanded@/bbackupd.pid
+PIDFILE=@localstatedir_expanded@/bbackupd/bbackupd.pid
 
 test -x $BBACKUPD || exit 0
@@ -34 +34 @@
                 echo -n "Restarting Box Backup Client daemon: bbackupd" 
                 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --exec $BBACKUPD
+                        --exec $BBACKUPD --retry 5
                 start-stop-daemon --start --quiet \
                         --exec $BBACKUPD > /dev/null

box/trunk/contrib/debian/bbstored.in

@@ -5 +5 @@
 BBSTORED=@sbindir_expanded@/bbstored
 CONFIG=@sysconfdir_expanded@/box/bbstored.conf
-PIDFILE=@localstatedir_expanded@/bbstored.pid
+PIDFILE=@localstatedir_expanded@/run/bbstored.pid
 
 test -x $BBACKUPD || exit 0
@@ -34 +34 @@
                 echo -n "Restarting Box Backup Server daemon: bbstored"
                 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --exec $BBSTORED
+                        --exec $BBSTORED --retry 5
                 start-stop-daemon --start --quiet \
                         --exec $BBSTORED > /dev/null