Author: baggins Date: Thu Apr 5 17:47:39 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- drop NFSv2/3 hack, these setting are only available on server
---- Files affected:
SOURCES:
nfslock.init (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SOURCES/nfslock.init
diff -u SOURCES/nfslock.init:1.16 SOURCES/nfslock.init:1.17
--- SOURCES/nfslock.init:1.16 Thu Apr 5 19:34:45 2007
+++ SOURCES/nfslock.init Thu Apr 5 19:47:34 2007
@@ -21,7 +21,7 @@
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
- msg_network_down "NFS lockd"
+ msg_network_down "NFS statd"
exit 1
fi
else
@@ -50,14 +50,10 @@
[ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o
$STATD_OUTPORT"
# Start daemons.
- if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
- msg_starting "NFS statd"
- daemon rpc.statd $STATDOPTS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
- else
- touch /var/lock/subsys/nfslock
- fi
+ msg_starting "NFS statd"
+ daemon rpc.statd $STATDOPTS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
else
msg_already_running "NFS statd"
fi
@@ -73,10 +69,8 @@
/sbin/sysctl -w fs.nfs.nlm_udpport=0 >/dev/null 2>&1
fi
# Stop daemons.
- if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
- msg_stopping "NFS statd"
- killproc rpc.statd
- fi
+ msg_stopping "NFS statd"
+ killproc rpc.statd
rm -f /var/lock/subsys/nfslock
else
msg_not_running "NFS statd"
@@ -93,13 +87,8 @@
stop
;;
status)
- if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
- status rpc.statd
- exit $?
- else
- echo "NFSv2 and NFSv3 disabled"
- exit 0
- fi
+ status rpc.statd
+ exit $?
;;
restart|force-reload)
stop
@@ -110,13 +99,9 @@
echo start
exit 0
fi
- if is_yes "$NFSv2" || is_yes "$NFSv3" ; then
- /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
- if [ $STATD = 1 ]; then
- echo restart
- exit 0
- fi
- else
+ /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
+ if [ $STATD = 1 ]; then
+ echo restart
exit 0
fi
;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nfslock.init?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
