Revert "Eventscript functions: add optional version to nfs_check_rpc_service()"
authorMartin Schwenke <martin@meltin.net>
Mon, 22 Apr 2013 20:14:43 +0000 (06:14 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 6 May 2013 10:40:58 +0000 (20:40 +1000)
This reverts commit 92f74fd589467b46c758e116e97417edfe8773d7.

This change is unused and is just complicating the function.

Conflicts:
config/functions

config/functions

index 07ac715806c2679edf786444800dbf9369cac8ba..c90ddb0c9decd6a86b9026f9b1cc67cc4bb0c85a 100755 (executable)
@@ -229,26 +229,20 @@ nfs_check_rpc_service ()
            which "rpc.${_prog_name}" >/dev/null 2>&1 || return 0
     esac
 
-    _v=""
-    case "$1" in
-       -*) : ;;
-       *) _v="$1" ; shift ;;
-    esac
-
-    _version=${_v:-1}
+    _version=1
     _rpc_prog="$_prog_name"
     _restart=""
     _opts=""
     case "$_prog_name" in
        knfsd)
            _rpc_prog=nfs
-           _version=${_v:-3}
+           _version=3
            _restart="echo 'Trying to restart NFS service'"
            _restart="${_restart}; startstop_nfs restart"
            ;;
        ganesha)
            _rpc_prog=nfs
-           _version=${_v:-3}
+           _version=3
            _restart="echo 'Trying to restart Ganesha NFS service'"
            _restart="${_restart}; startstop_ganesha restart"
            ;;
@@ -260,7 +254,7 @@ nfs_check_rpc_service ()
            ;;
        lockd)
            _rpc_prog=nlockmgr
-           _version=${_v:-4}
+           _version=4
            _restart="echo 'Trying to restart lock manager service'"
            _restart="${_restart}; startstop_nfslock restart"
            ;;