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

View File

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

View File

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