diff --git a/nfs-utils.spec b/nfs-utils.spec index 10eb730..d3e0993 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -15,7 +15,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.6 -%define release 24 +%define release 27 %define Release %{release} %if %{rhel3build} @@ -174,13 +174,22 @@ if [ "$?" -eq 1 ]; then fi %post -/sbin/chkconfig --add nfs -/sbin/chkconfig --add nfslock +if [ "$1" -ge 1 ]; then +%if %{nfsv4_support} + /etc/rc.d/init.d/rpcidmapd condrestart > /dev/null + /etc/rc.d/init.d/rpcgssd condrestart > /dev/null + /etc/rc.d/init.d/rpcsvcgssd condrestart > /dev/null +%endif + /etc/rc.d/init.d/nfs condrestart > /dev/null +else + /sbin/chkconfig --add nfs + /sbin/chkconfig --add nfslock %if %{nfsv4_support} -/sbin/chkconfig --add rpcidmapd -/sbin/chkconfig --add rpcgssd -/sbin/chkconfig --add rpcsvcgssd + /sbin/chkconfig --add rpcidmapd + /sbin/chkconfig --add rpcgssd + /sbin/chkconfig --add rpcsvcgssd %endif +fi %preun if [ "$1" = "0" ]; then @@ -201,6 +210,7 @@ if [ "$1" = "0" ]; then %endif fi + %triggerpostun -- nfs-server /sbin/chkconfig --add nfs @@ -246,7 +256,12 @@ fi %config /etc/rc.d/init.d/nfslock %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Mon Jun 14 2004 +- Fixed syntax error in nfs initscripts when + NETWORKING is not defined - Removed sync warning on readonly exports. %if %{fcbuild} - Changed run levels in rpc initscripts. diff --git a/nfs.init b/nfs.init index f3a7368..4306e4f 100755 --- a/nfs.init +++ b/nfs.init @@ -21,7 +21,7 @@ fi . /etc/sysconfig/network # Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 +[ "${NETWORKING}" = "no" ] && exit 0 [ -x /usr/sbin/rpc.nfsd ] || exit 0 [ -x /usr/sbin/rpc.mountd ] || exit 0 diff --git a/nfslock.init b/nfslock.init index e7e9ea7..918bd1d 100755 --- a/nfslock.init +++ b/nfslock.init @@ -23,7 +23,7 @@ fi . /etc/sysconfig/network # Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 +[ "${NETWORKING}" = "no" ] && exit 0 # Start lockd from userland only if kernel <= 2.2.18 OS_RELEASE=`uname --release`