- kill some indent

Changed files:
    nfs.init -> 1.49
    nfsfs.init -> 1.42
    nfslock.init -> 1.21
    rpcgssd.init -> 1.10
    rpcidmapd.init -> 1.15
    rpcsvcgssd.init -> 1.13

diff --git a/nfs.init b/nfs.init
index 37cffe7ea751d90908493bdd328974db933e80e4..7c25325cb6bda4620712b4ede098080f3f804593 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -40,53 +40,55 @@ fi
 
 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
+       if [ -f /var/lock/subsys/nfs ]; then
+               msg_already_running "NFS daemon"
+               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
+       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
 
-               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
-               msg_already_running "NFS daemon"
+       # 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

diff --git a/nfsfs.init b/nfsfs.init
index c0783d35361b803764136e6b7139408564aa2e51..8386982af14385e7638ce58dde2798d350720ee1 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -40,30 +40,30 @@ if [ -z "$NFSUMOUNT_IGNORE" ]; then
 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 @@ case "$1" in
   stop)
        stop
        ;;
+  restart)
+       stop
+       start
+       ;;
+  reload|force-reload)
+       mount -a -t nfs,nfs4
+       ;;
   status)
        if [ -f /proc/mounts ]; then
                echo "Configured NFS mountpoints:"
@@ -121,13 +128,6 @@ case "$1" in
                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}"
        exit 3

diff --git a/nfslock.init b/nfslock.init
index 063633466f15262f76d2825fe9a5acd086f1957e..302c0516a84271eff5b27870d62aeb9031eb66a4 100644 (file)
--- a/nfslock.init
+++ b/nfslock.init
@@ -39,45 +39,47 @@ fi
 
 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 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status rpc.statd
-       exit $?
-       ;;
   restart|force-reload)
        stop
        start
@@ -108,6 +106,10 @@ case "$1" in
                exit 0
        fi
        ;;
+  status)
+       status rpc.statd
+       exit $?
+       ;;
   *)
        msg_usage "$0 {start|stop|restart|force-reload|probe|status}"
        exit 3

diff --git a/rpcgssd.init b/rpcgssd.init
index 38ae48ce5d23d863a4709a1071ed7295fafdab52..c39ec4e2d485ec4efa75c41c1a3269e05172b3c9 100644 (file)
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -39,33 +39,35 @@ is_yes "${SECURE_NFS}" || exit 0
 
 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,14 +79,14 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status rpc.gssd
-       RETVAL=$?
-       ;;
   restart|reload)
        stop
        start
        ;;
+  status)
+       status rpc.gssd
+       RETVAL=$?
+       ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"
        exit 1

diff --git a/rpcidmapd.init b/rpcidmapd.init
index f10ae439bc46883285a0c518bff1df0d0b5996e5..07c9aefc392b17f16897562529e559714c00d1d8 100644 (file)
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -38,38 +38,40 @@ RUNLEVELDIR=$(cat /var/run/runlevel.dir)
 
 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 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status rpc.idmapd
-       RETVAL=$?
-       ;;
   restart)
        stop
        start
@@ -95,10 +93,14 @@ case "$1" in
                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}"
        exit 1

diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index 1e16bc1088843d4390d701fab5c7a5f276697ad3..a16c4f14711a45d348119c1cab12e28b41d5055e 100644 (file)
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -36,33 +36,35 @@ is_yes "${SECURE_NFS}" || exit 0
 
 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,14 +76,14 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status rpc.svcgssd
-       RETVAL=$?
-       ;;
   restart|reload)
        stop
        start
        ;;
+  status)
+       status rpc.svcgssd
+       RETVAL=$?
+       ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"
        exit 1