Accepting request 48561 from network

checked in (request 48561)

OBS-URL: https://build.opensuse.org/request/show/48561
OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=10
This commit is contained in:
OBS User autobuild 2010-09-22 08:48:46 +00:00 committed by Git OBS Bridge
parent 33d9426a20
commit 9bece6f6e5
2 changed files with 8 additions and 16 deletions

View File

@ -1,14 +1,3 @@
-------------------------------------------------------------------
Sun Sep 19 10:55:59 UTC 2010 - jengelh@medozas.de
- rsyncd.rc changes:
* Do not use killproc -TERM, but just killproc, so that killproc
waits until the service is actually shut down, before attempting
to restart it (when "restart" is used). Fixes bnc#546977.
* Change the "reload" action to return "missing" because rsyncd
does not handle SIGHUP
* Adjust "force-reload" accordingly
-------------------------------------------------------------------
Mon Jan 4 14:21:21 UTC 2010 - puzel@novell.com

View File

@ -76,7 +76,7 @@ case "$1" in
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.
killproc -p $RSYNCD_PID $RSYNCD_BIN
killproc -p $RSYNCD_PID -TERM $RSYNCD_BIN
# Remember status and be verbose
rc_status -v
@ -104,14 +104,17 @@ case "$1" in
## do this on signal 1 (SIGHUP).
## If it does not support it, restart.
echo "Reload service rsync"
"$0" restart
echo -n "Reload service rsync"
killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN
rc_status -v
;;
reload)
# rsyncd does not catch SIGHUP
## Like force-reload, but if daemon does not support
## signalling, do nothing (!)
# If it supports signalling:
echo -n "Reload service rsync"
rc_failed 3
killproc -p $RSYNCD_PID -HUP $RSYNCD_BIN
rc_status -v
;;
status)