SOURCES: rpcsvcgssd.init, rpcgssd.init, rpcidmapd.init, nfsfs.init, nfslock...
glen
glen at pld-linux.org
Sat Mar 21 23:35:20 CET 2009
Author: glen Date: Sat Mar 21 22:35:20 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- kill some indent
---- Files affected:
SOURCES:
rpcsvcgssd.init (1.12 -> 1.13) , rpcgssd.init (1.9 -> 1.10) , rpcidmapd.init (1.14 -> 1.15) , nfsfs.init (1.41 -> 1.42) , nfslock.init (1.20 -> 1.21) , nfs.init (1.48 -> 1.49)
---- Diffs:
================================================================
Index: SOURCES/rpcsvcgssd.init
diff -u SOURCES/rpcsvcgssd.init:1.12 SOURCES/rpcsvcgssd.init:1.13
--- SOURCES/rpcsvcgssd.init:1.12 Tue Sep 25 18:09:30 2007
+++ SOURCES/rpcsvcgssd.init Sat Mar 21 23:35:12 2009
@@ -36,33 +36,35 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/svcgssd ]; then
- # We need /proc/fs/nfsd mounted before starting svcgssd
- if ! grep -q nfsd /proc/mounts ; then
- modprobe nfsd > /dev/null 2>&1
- run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
- fi
- # Load rpcsec modules
- for i in ${SECURE_NFS_MODS} ; do
- _modprobe single die $i
- done
- msg_starting "RPC svcgssd"
- daemon rpc.svcgssd $RPCSVCGSSOPTIONS
- RETVAL=$?
- [ $RETVAL = 0 ] && touch /var/lock/subsys/svcgssd
- else
+ if [ -f /var/lock/subsys/svcgssd ]; then
msg_already_running "RPC svcgssd"
+ return
+ fi
+
+ # We need /proc/fs/nfsd mounted before starting svcgssd
+ if ! grep -q nfsd /proc/mounts ; then
+ modprobe nfsd > /dev/null 2>&1
+ run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
fi
+ # Load rpcsec modules
+ for i in ${SECURE_NFS_MODS} ; do
+ _modprobe single die $i
+ done
+ msg_starting "RPC svcgssd"
+ daemon rpc.svcgssd $RPCSVCGSSOPTIONS
+ RETVAL=$?
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/svcgssd
}
stop() {
- if [ -f /var/lock/subsys/svcgssd ]; then
- msg_stopping "RPC svcgssd"
- killproc rpc.svcgssd
- rm -f /var/lock/subsys/svcgssd
- else
+ if [ ! -f /var/lock/subsys/svcgssd ]; then
msg_not_running "RPC svcgssd"
+ return
fi
+
+ msg_stopping "RPC svcgssd"
+ killproc rpc.svcgssd
+ rm -f /var/lock/subsys/svcgssd
}
# See how we were called.
@@ -74,13 +76,13 @@
stop)
stop
;;
- status)
- status rpc.svcgssd
- RETVAL=$?
- ;;
restart|reload)
stop
start
+ ;;
+ status)
+ status rpc.svcgssd
+ RETVAL=$?
;;
*)
msg_usage "$0 {start|stop|restart|status}"
================================================================
Index: SOURCES/rpcgssd.init
diff -u SOURCES/rpcgssd.init:1.9 SOURCES/rpcgssd.init:1.10
--- SOURCES/rpcgssd.init:1.9 Tue Sep 25 18:09:30 2007
+++ SOURCES/rpcgssd.init Sat Mar 21 23:35:13 2009
@@ -39,33 +39,35 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/gssd ]; then
- if ! grep -q rpc_pipefs /proc/mounts ; then
- modprobe sunrpc >/dev/null 2>&1
- run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
- mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
- fi
- # Load rpcsec modules
- for i in ${SECURE_NFS_MODS} ; do
- _modprobe single die $i
- done
- msg_starting "RPC gssd"
- daemon rpc.gssd $RPCGSSOPTIONS
- RETVAL=$?
- [ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
- else
+ if [ -f /var/lock/subsys/gssd ]; then
msg_already_running "RPC gssd"
+ return
+ fi
+
+ if ! grep -q rpc_pipefs /proc/mounts; then
+ modprobe sunrpc >/dev/null 2>&1
+ run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
+ mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
fi
+ # Load rpcsec modules
+ for i in ${SECURE_NFS_MODS}; do
+ _modprobe single die $i
+ done
+ msg_starting "RPC gssd"
+ daemon rpc.gssd $RPCGSSOPTIONS
+ RETVAL=$?
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
}
stop() {
- if [ -f /var/lock/subsys/gssd ]; then
- msg_stopping "RPC gssd"
- killproc rpc.gssd
- rm -f /var/lock/subsys/gssd
- else
+ if [ ! -f /var/lock/subsys/gssd ]; then
msg_not_running "RPC gssd"
+ return
fi
+
+ msg_stopping "RPC gssd"
+ killproc rpc.gssd
+ rm -f /var/lock/subsys/gssd
}
# See how we were called.
@@ -77,13 +79,13 @@
stop)
stop
;;
- status)
- status rpc.gssd
- RETVAL=$?
- ;;
restart|reload)
stop
start
+ ;;
+ status)
+ status rpc.gssd
+ RETVAL=$?
;;
*)
msg_usage "$0 {start|stop|restart|status}"
================================================================
Index: SOURCES/rpcidmapd.init
diff -u SOURCES/rpcidmapd.init:1.14 SOURCES/rpcidmapd.init:1.15
--- SOURCES/rpcidmapd.init:1.14 Tue Sep 25 18:09:30 2007
+++ SOURCES/rpcidmapd.init Sat Mar 21 23:35:13 2009
@@ -38,38 +38,40 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/idmapd ]; then
- # This is whacko, but we need /proc/fs/nfsd mounted before
- # starting idmapd on NFS server
- if [ -e "$RUNLEVELDIR"/S*nfs ]; then
- if ! grep -q nfsd /proc/mounts ; then
- modprobe nfsd > /dev/null 2>&1
- run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
- fi
- fi
- if ! grep -q rpc_pipefs /proc/mounts ; then
- modprobe sunrpc >/dev/null 2>&1
- run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
- mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
- fi
-
- msg_starting "RPC idmapd"
- daemon rpc.idmapd $RPCIDMAPOPTIONS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/idmapd
- else
+ if [ -f /var/lock/subsys/idmapd ]; then
msg_already_running "RPC idmapd"
+ return
fi
+
+ # This is whacko, but we need /proc/fs/nfsd mounted before
+ # starting idmapd on NFS server
+ if [ -e "$RUNLEVELDIR"/S*nfs ]; then
+ if ! grep -q nfsd /proc/mounts ; then
+ modprobe nfsd > /dev/null 2>&1
+ run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
+ fi
+ fi
+ if ! grep -q rpc_pipefs /proc/mounts; then
+ modprobe sunrpc >/dev/null 2>&1
+ run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
+ mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+ fi
+
+ msg_starting "RPC idmapd"
+ daemon rpc.idmapd $RPCIDMAPOPTIONS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/idmapd
}
stop() {
- if [ -f /var/lock/subsys/idmapd ]; then
- msg_stopping "RPC idmapd"
- killproc rpc.idmapd
- rm -f /var/lock/subsys/idmapd
- else
+ if [ ! -f /var/lock/subsys/idmapd ]; then
msg_not_running "RPC idmapd"
+ return
fi
+
+ msg_stopping "RPC idmapd"
+ killproc rpc.idmapd
+ rm -f /var/lock/subsys/idmapd
}
# See how we were called.
@@ -81,10 +83,6 @@
stop)
stop
;;
- status)
- status rpc.idmapd
- RETVAL=$?
- ;;
restart)
stop
start
@@ -95,9 +93,13 @@
killproc rpc.idmapd -HUP
RETVAL=$?
else
- msg_not_running "RPC idmapd" >&2
+ msg_not_running "RPC idmapd"
exit 7
fi
+ ;;
+ status)
+ status rpc.idmapd
+ RETVAL=$?
;;
*)
msg_usage "$0 {start|stop|restart|reload|status}"
================================================================
Index: SOURCES/nfsfs.init
diff -u SOURCES/nfsfs.init:1.41 SOURCES/nfsfs.init:1.42
--- SOURCES/nfsfs.init:1.41 Sun Mar 15 12:04:13 2009
+++ SOURCES/nfsfs.init Sat Mar 21 23:35:14 2009
@@ -40,30 +40,30 @@
fi
start() {
- if [ ! -f /var/lock/subsys/nfsfs ]; then
- # Set the ports lockd should listen on
- if [ -n "$LOCKD_TCPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
- fi
- if [ -n "$LOCKD_UDPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
- fi
+ if [ -f /var/lock/subsys/nfsfs ]; then
+ msg_already_running "NFSFS"
+ return
+ fi
- # Special case /usr first
- if ! awk '{ if ($2 == "/usr" && $3 ~ /^nfs(4$|$)/ && $4 !~ /noauto/) exit 1}' /etc/fstab ; then
- run_cmd "Mounting /usr filesystem" mount /usr
- # In case of /usr over NFS idmapd, gssd and lockd may not start
- # check if they're running and try to start them if not
- /sbin/service idmapd status >/dev/null || /sbin/service idmapd start
- /sbin/service gssd status >/dev/null || /sbin/service gssd start
- /sbin/service nfslock status >/dev/null || /sbin/service nfslock start
- fi
- run_cmd "Mounting NFS filesystems" mount -a -t nfs,nfs4
- touch /var/lock/subsys/nfsfs
+ # Set the ports lockd should listen on
+ if [ -n "$LOCKD_TCPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+ fi
+ if [ -n "$LOCKD_UDPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
+ fi
- else
- msg_already_running "NFSFS"
+ # Special case /usr first
+ if ! awk '{ if ($2 == "/usr" && $3 ~ /^nfs(4$|$)/ && $4 !~ /noauto/) exit 1}' /etc/fstab; then
+ run_cmd "Mounting /usr filesystem" mount /usr
+ # In case of /usr over NFS idmapd, gssd and lockd may not start
+ # check if they're running and try to start them if not
+ /sbin/service idmapd status >/dev/null || /sbin/service idmapd start
+ /sbin/service gssd status >/dev/null || /sbin/service gssd start
+ /sbin/service nfslock status >/dev/null || /sbin/service nfslock start
fi
+ run_cmd "Mounting NFS filesystems" mount -a -t nfs,nfs4
+ touch /var/lock/subsys/nfsfs
}
stop() {
@@ -109,6 +109,13 @@
stop)
stop
;;
+ restart)
+ stop
+ start
+ ;;
+ reload|force-reload)
+ mount -a -t nfs,nfs4
+ ;;
status)
if [ -f /proc/mounts ]; then
echo "Configured NFS mountpoints:"
@@ -120,13 +127,6 @@
else
echo "/proc filesystem unavailable"
fi
- ;;
- restart)
- stop
- start
- ;;
- reload|force-reload)
- mount -a -t nfs,nfs4
;;
*)
msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
================================================================
Index: SOURCES/nfslock.init
diff -u SOURCES/nfslock.init:1.20 SOURCES/nfslock.init:1.21
--- SOURCES/nfslock.init:1.20 Fri Apr 27 00:19:06 2007
+++ SOURCES/nfslock.init Sat Mar 21 23:35:14 2009
@@ -39,45 +39,47 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/nfslock ]; then
- # Set the ports lockd should listen on
- if [ -n "$LOCKD_TCPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
- fi
- if [ -n "$LOCKD_UDPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
- fi
-
- [ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
- [ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
-
- # Start daemons.
- # Don't put sm-notify here, statd will run it when started
- msg_starting "RPC statd"
- daemon rpc.statd $STATDOPTS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
- else
+ if [ -f /var/lock/subsys/nfslock ]; then
msg_already_running "RPC statd"
+ return
+ fi
+
+ # Set the ports lockd should listen on
+ if [ -n "$LOCKD_TCPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+ fi
+ if [ -n "$LOCKD_UDPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
fi
+
+ [ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
+ [ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
+
+ # Start daemons.
+ # Don't put sm-notify here, statd will run it when started
+ msg_starting "RPC statd"
+ daemon rpc.statd $STATDOPTS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
}
stop() {
- if [ -f /var/lock/subsys/nfslock ]; then
- # Reset the lockd ports if they were set
- if [ -n "$LOCKD_TCPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_tcpport=0 >/dev/null 2>&1
- fi
- if [ -n "$LOCKD_UDPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_udpport=0 >/dev/null 2>&1
- fi
- # Stop daemons.
- msg_stopping "RPC statd"
- killproc rpc.statd
- rm -f /var/lock/subsys/nfslock
- else
+ if [ ! -f /var/lock/subsys/nfslock ]; then
msg_not_running "RPC statd"
+ return
+ fi
+
+ # Reset the lockd ports if they were set
+ if [ -n "$LOCKD_TCPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_tcpport=0 >/dev/null 2>&1
+ fi
+ if [ -n "$LOCKD_UDPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_udpport=0 >/dev/null 2>&1
fi
+ # Stop daemons.
+ msg_stopping "RPC statd"
+ killproc rpc.statd
+ rm -f /var/lock/subsys/nfslock
}
RETVAL=0
@@ -89,10 +91,6 @@
stop)
stop
;;
- status)
- status rpc.statd
- exit $?
- ;;
restart|force-reload)
stop
start
@@ -107,6 +105,10 @@
echo restart
exit 0
fi
+ ;;
+ status)
+ status rpc.statd
+ exit $?
;;
*)
msg_usage "$0 {start|stop|restart|force-reload|probe|status}"
================================================================
Index: SOURCES/nfs.init
diff -u SOURCES/nfs.init:1.48 SOURCES/nfs.init:1.49
--- SOURCES/nfs.init:1.48 Fri Nov 21 10:35:55 2008
+++ SOURCES/nfs.init Sat Mar 21 23:35:15 2009
@@ -40,53 +40,55 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/nfs ]; then
- if ! grep -q nfsd /proc/mounts ; then
- modprobe -s nfsd > /dev/null 2>&1
- run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
- fi
-
- # Set the ports lockd should listen on
- if [ -n "$LOCKD_TCPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
- fi
- if [ -n "$LOCKD_UDPPORT" ]; then
- /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
- fi
-
- for vers in 1 2 3 4 ; do
- is_yes $(eval echo \$NFSv$vers) || \
- RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version $vers"
- done
-
- [ -n "$MOUNTD_PORT" ] && RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS -p $MOUNTD_PORT"
-
- # Start daemons.
- msg_starting "NFS exportfs"
- daemon /usr/sbin/exportfs -r
- msg_starting "NFS mountd"
- daemon rpc.mountd $RPCMOUNTOPTIONS
- msg_starting "NFS daemon"
- daemon rpc.nfsd $RPCNFSDCOUNT
- touch /var/lock/subsys/nfs
- else
+ if [ -f /var/lock/subsys/nfs ]; then
msg_already_running "NFS daemon"
+ return
+ fi
+
+ if ! grep -q nfsd /proc/mounts ; then
+ modprobe -s nfsd > /dev/null 2>&1
+ run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
+ fi
+
+ # Set the ports lockd should listen on
+ if [ -n "$LOCKD_TCPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+ fi
+ if [ -n "$LOCKD_UDPPORT" ]; then
+ /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
fi
+
+ for vers in 1 2 3 4 ; do
+ is_yes $(eval echo \$NFSv$vers) || \
+ RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version $vers"
+ done
+
+ [ -n "$MOUNTD_PORT" ] && RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS -p $MOUNTD_PORT"
+
+ # Start daemons.
+ msg_starting "NFS exportfs"
+ daemon /usr/sbin/exportfs -r
+ msg_starting "NFS mountd"
+ daemon rpc.mountd $RPCMOUNTOPTIONS
+ msg_starting "NFS daemon"
+ daemon rpc.nfsd $RPCNFSDCOUNT
+ touch /var/lock/subsys/nfs
}
stop() {
- if [ -f /var/lock/subsys/nfs ]; then
- # Stop daemons.
- msg_stopping "NFS daemon"
- killproc nfsd -QUIT
- msg_stopping "NFS mountd"
- killproc rpc.mountd
- msg_stopping "NFS exportfs"
- daemon /usr/sbin/exportfs -au
- rm -f /var/lock/subsys/nfs
- else
+ if [ ! -f /var/lock/subsys/nfs ]; then
msg_not_running "NFS"
+ return
fi
+
+ # Stop daemons.
+ msg_stopping "NFS daemon"
+ killproc nfsd -QUIT
+ msg_stopping "NFS mountd"
+ killproc rpc.mountd
+ msg_stopping "NFS exportfs"
+ daemon /usr/sbin/exportfs -au
+ rm -f /var/lock/subsys/nfs
}
RETVAL=0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpcsvcgssd.init?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpcgssd.init?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpcidmapd.init?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nfsfs.init?r1=1.41&r2=1.42&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nfslock.init?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nfs.init?r1=1.48&r2=1.49&f=u
More information about the pld-cvs-commit
mailing list