From 4c51d8b070f15a60f5fc83a14c1adfbd0d3d0af9 Mon Sep 17 00:00:00 2001 From: vcrhonek Date: Mon, 24 Nov 2008 13:59:40 +0000 Subject: [PATCH] Last few Merge Review related changes, Fix init script arguments and return values --- ypbind.init | 70 ++++++++++++++++++++++++++++++++++++++--------------- ypbind.spec | 17 +++++++------ 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/ypbind.init b/ypbind.init index bf94bdf..254be28 100755 --- a/ypbind.init +++ b/ypbind.init @@ -12,6 +12,16 @@ # processname: ypbind # config: /etc/yp.conf +### BEGIN INIT INFO +# Provides: $ypbind +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: start|stop|restart|condrestart|try-restart|reload|force-reload|status NIS client +# Description: This is a daemon which runs on NIS/YP clients and binds them to a NIS domain +### END INIT INFO + OTHER_YPBIND_OPTS="" # Source function library. @@ -99,18 +109,18 @@ start() { fi fi sleep 2 - echo -n "..." + echo -n "." done if [ $RETVAL -eq 0 ]; then - logger -t ypbind \ - "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`" - touch /var/lock/subsys/ypbind - success + logger -t ypbind \ + "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`" + touch /var/lock/subsys/ypbind + success else - logger -t ypbind \ - "NIS server for domain `domainname` is not responding." - failure - #selinux_off + logger -t ypbind \ + "NIS server for domain `domainname` is not responding." + failure + #selinux_off RETVAL=100 fi echo @@ -121,10 +131,10 @@ stop() { echo -n $"Shutting down NIS service: " killproc ypbind RETVAL=$? - if [ $RETVAL -eq 0 ] ; then + if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/ypbind # if we used brute force (like kill -9) we don't want those around - if [ x$(domainname) != x ] ; then + if [ x$(domainname) != x ]; then rm -f /var/yp/binding/$(domainname)* fi fi @@ -138,30 +148,52 @@ restart() { start } +reload() { + echo -n $"Reloading NIS service: " + p=`/sbin/pidof -o %PPID 'ypbind'` + RETVAL=$? + if [ "$RETVAL" -eq 0 ]; then + /bin/kill -HUP $p + RETVAL=$? + fi + [ "$RETVAL" -eq 0 ] && success || failure + echo + return $RETVAL +} + RETVAL=0 # See how we were called. case "$1" in start) - start - [ $? -eq 100 ] && stop + start + RETVAL=$? + if [ $RETVAL -eq 100 ]; then stop; RETVAL=1; fi ;; stop) stop + RETVAL=$? ;; status) status ypbind RETVAL=$? ;; - restart|reload) + restart) restart + RETVAL=$? ;; - condrestart) - [ -f /var/lock/subsys/ypbind ] && restart || : + condrestart|try-restart) + if [ -e /var/lock/subsys/ypbind ]; then restart; fi + ;; + reload) + reload + ;; + force-reload) + if ! reload; then restart; fi ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - exit 1 + echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" + RETVAL=3 esac -exit $? +exit $RETVAL diff --git a/ypbind.spec b/ypbind.spec index 86a8be7..d3216e3 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,10 +1,10 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.20.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons -Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2 +Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html Source1: ypbind.init Patch1: ypbind-1.11-broadcast.patch @@ -22,7 +22,6 @@ Requires: rpcbind, yp-tools Epoch: 3 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, automake BuildRequires: dbus-glib-devel, docbook-style-xsl %description @@ -51,7 +50,6 @@ also need to install the ypserv package to a machine on your network. %patch5 -p1 -b .smartwrite %build -autoreconf %configure --sbindir=/sbin make @@ -92,18 +90,23 @@ fi %doc README NEWS %changelog -* Tue Oct 21 2008 Vitezslav Crhonek - 1.20.4-9 +* Mon Nov 24 2008 Vitezslav Crhonek - 3:1.20.4-10 +- Last few Merge Review related changes +- Fix init script arguments and return values + Resolves: #247104, #467861 + +* Tue Oct 21 2008 Vitezslav Crhonek - 3:1.20.4-9 - Merge Review - remove dot from end of the summary, convert all tags in %%changelog to utf-8, escape %% character in changelog, fix requires and scriptlets, remove %%makeinstall, do not mark init script file as config, remove unused patches Resolves: #226663 -* Tue Oct 21 2008 Vitezslav Crhonek - 1.20.4-8 +* Tue Oct 21 2008 Vitezslav Crhonek - 3:1.20.4-8 - Rewrite binding files only when they are changed Resolves: #454581 -* Mon Aug 11 2008 Jason L Tibbitts III - 1.20.4-7 +* Mon Aug 11 2008 Jason L Tibbitts III - 3:1.20.4-7 - Fix license tag. * Tue Jun 10 2008 Vitezslav Crhonek - 3:1.20.4-6