From a91e49a8d841b066e948a49439fcb3f3dbba4bde Mon Sep 17 00:00:00 2001 From: HAT Date: Thu, 14 Feb 2013 23:27:29 +0900 Subject: [PATCH] update RedHat initscript "graceful" is removed because SIGQUIT is gone. "reload" use SIGHUP. "condrestart" is added because spec file requires it. --- NEWS | 1 + distrib/initscripts/rc.redhat.tmpl | 31 ++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index eb0b275c..934ce79d 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Changes in 3.0.3 alternative path for the netatalk lockfile. * UPD: systemd service file use PIDFile and ExecReload. From FR #70. +* UPD: RedHat sysvinit: rm graceful, reimplement reload, add condrestart * FIX: Couldn't create folders on FreeBSD 9.1 ZFS fileystems. Fixed bug #491. diff --git a/distrib/initscripts/rc.redhat.tmpl b/distrib/initscripts/rc.redhat.tmpl index 643448ae..0721d9f6 100644 --- a/distrib/initscripts/rc.redhat.tmpl +++ b/distrib/initscripts/rc.redhat.tmpl @@ -21,7 +21,7 @@ RETVAL=1 netatalk_startup() { # Check that networking is up. if [ ${NETWORKING} = "no" ]; then - echo "[Network isn't started]"; + echo "[Network isn't started]"; exit 1; fi @@ -51,11 +51,17 @@ netatalk_stop() { fi } -# code to cause apfd and cnid_metad to restart -netatalk_graceful() { +# restart code +netatalk_restart() { + netatalk_stop + netatalk_startup +} + +# reload config files +netatalk_reload() { if [ -x ${NETATALK_SBIN}/netatalk ]; then - echo -n $"Restarting cnid_metad and afpd: " - killproc netatalk -QUIT + echo -n $"Reloading $prog: " + killproc netatalk -HUP RETVAL=$? echo fi @@ -68,20 +74,21 @@ case "$1" in 'stop') netatalk_stop ;; - 'restart'|'reload') - $0 stop - $0 start - RETVAL=$? + 'restart') + netatalk_restart + ;; + 'reload'|'graceful') + netatalk_reload ;; 'status') status netatalk RETVAL=$? ;; - 'graceful') - netatalk_graceful + 'condrestart') + [ -f /var/lock/subsys/netatalk ] && netatalk_restart || : ;; *) - echo "Usage: $0 {start|stop|restart|reload|status|graceful}" + echo "Usage: $0 {start|stop|restart|reload|status|condrestart}" exit 2 esac -- 2.39.2