OBS User unknown 2008-05-16 12:47:01 +00:00 committed by Git OBS Bridge
parent a0637e4966
commit 05c8a80c1b
4 changed files with 33 additions and 38 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 14 23:22:32 CEST 2008 - schwab@suse.de
- Fix some lost exit status in init scripts.
-------------------------------------------------------------------
Tue May 6 08:00:18 CEST 2008 - nfbrown@suse.de

View File

@ -16,7 +16,7 @@ BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent libgssglue-devel lib
Url: http://nfs.sourceforge.net
Summary: Support Utilities for Kernel nfsd
Version: 1.1.2
Release: 6
Release: 7
Group: Productivity/Networking/NFS
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -252,6 +252,8 @@ rm -rf $RPM_BUILD_ROOT
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
%changelog
* Thu May 15 2008 schwab@suse.de
- Fix some lost exit status in init scripts.
* Tue May 06 2008 nfbrown@suse.de
- nfs-utils-1.1.2-start-statd.patch - statd needs to be started
when using 'string' options to kernel was well as when using

View File

@ -155,20 +155,18 @@ case "$1" in
# gssd
if [ "$NEED_GSSD" = yes ]; then
echo -n " gssd"
do_start_gssd
if [ $? != 0 ]; then
do_start_gssd || {
rc_status -v
rc_exit
fi
}
fi
# idmapd
if [ "$NEED_IDMAPD" = yes ]; then
echo -n " idmapd"
do_start_idmapd
if [ $? != 0 ]; then
do_start_idmapd || {
rc_status -v
rc_exit
fi
}
echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE
fi
# statd is started when needed by mount.nfs
@ -212,22 +210,20 @@ case "$1" in
#
if [ "$NEED_GSSD" = yes ]; then
echo -n " gssd"
killproc $GSSD_BIN
if [ $? != 0 ]; then
killproc $GSSD_BIN || {
rc_status -v
rc_exit
fi
}
fi
#
if [ "$NEED_IDMAPD" = yes ]; then
# only stop idmapd if it is not needed by server
if [ ! -f $IDMAPD_SERVER_STATE ]; then
echo -n " idmapd"
killproc $IDMAPD_BIN
if [ $? != 0 ]; then
killproc $IDMAPD_BIN || {
rc_status -v
rc_exit
fi
}
fi
rm -f $IDMAPD_CLIENT_STATE
fi

View File

@ -177,19 +177,17 @@ case "$1" in
# svcgssd; idmapd
if [ "$NEED_SVCGSSD" = yes ]; then
echo -n " svcgssd"
do_start_svcgssd
if [ $? != 0 ]; then
rc_status -v
do_start_svcgssd || {
rc_status -v
rc_exit
fi
}
fi
if [ "$NEED_IDMAPD" = yes ]; then
echo -n " idmapd"
do_start_idmapd
if [ $? != 0 ]; then
do_start_idmapd || {
rc_status -v
rc_exit
fi
}
echo $IDMAPD_BIN > $IDMAPD_SERVER_STATE
fi
# exportfs
@ -200,25 +198,22 @@ case "$1" in
startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $VERSION_PARAMS
else
startproc /usr/sbin/rpc.mountd $VERSION_PARAMS
fi
if [ $? != 0 ]; then
fi || {
rc_status -v
rc_exit
fi
}
# rpc.statd
echo -n " statd"
startproc /usr/sbin/rpc.statd --no-notify
if [ $? != 0 ]; then
startproc /usr/sbin/rpc.statd --no-notify || {
rc_status -v
rc_exit
fi
}
# rpc.nfsd
echo -n " nfsd"
$NFSD_BIN $PARAMS $VERSION_PARAMS
if [ $? != 0 ]; then
$NFSD_BIN $PARAMS $VERSION_PARAMS || {
rc_status -v
rc_exit
fi
}
# sm-notify needs to be run last
echo -n " sm-notify"
/usr/sbin/sm-notify $SM_NOTIFY_OPTIONS
@ -229,11 +224,10 @@ case "$1" in
echo -n "Shutting down kernel based NFS server:"
# rpc.nfsd
echo -n " nfsd"
killproc -n -KILL nfsd
if [ $? != 0 ]; then
killproc -n -KILL nfsd || {
rc_status -v
rc_exit
fi
}
# rpc.statd
if ! checkproc -n lockd; then
echo -n " statd"
@ -242,19 +236,17 @@ case "$1" in
#
# rpc.mountd
echo -n " mountd"
killproc -TERM /usr/sbin/rpc.mountd
if [ $? != 0 ]; then
killproc -TERM /usr/sbin/rpc.mountd || {
rc_status -v
rc_exit
fi
}
# svcgssd
if [ "$NEED_SVCGSSD" = yes ]; then
echo -n " svcgssd"
killproc $SVCGSSD_BIN
if [ $? != 0 ]; then
killproc $SVCGSSD_BIN || {
rc_status -v
rc_exit
fi
}
fi
# idmap
if [ "$NEED_IDMAPD" = yes ]; then