X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rsync.init;h=6f0ba5ef530809c5650e9b7ad1b6cf2276dd5788;hb=30529548bdc253f8c1ffecd1a5f0d9a91c423cac;hp=77c0379a8d9005b7ad5a9d510c72518527ad1a61;hpb=866a0dbe3fdadce5d904a6d34f639687c8edb911;p=packages%2Frsync.git

diff --git a/rsync.init b/rsync.init
index 77c0379..6f0ba5e 100644
--- a/rsync.init
+++ b/rsync.init
@@ -16,7 +16,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network ]; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
 		msg_network_down rsyncd
 		exit 1
 	fi
@@ -24,23 +24,22 @@ else
 	exit 0
 fi
 
-. /etc/sysconfig/rsyncd
+# Get service configuration
+[ -f /etc/sysconfig/rsyncd ] && . /etc/sysconfig/rsyncd
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Start daemons.
 	if [ ! -f /var/lock/subsys/rsyncd ]; then
 		msg_starting rsyncd
-		daemon rsync --daemon
+		daemon /usr/bin/rsync --daemon --dparam=pidfile=/var/run/rsync.pid ${RSYNC_OPTIONS}
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyncd
 	else
 		msg_already_running rsyncd
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	# Stop daemons.
 	if [ -f /var/lock/subsys/rsyncd ]; then
 		msg_stopping rsyncd
@@ -49,18 +48,43 @@ case "$1" in
 	else
 		msg_not_running rsyncd
 	fi
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/rsyncd ]; then
+		stop
+		start
+	else
+		msg_not_running rsyncd
+		RETVAL=$1
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
-	status rsync
+	status rsyncd rsync
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac