diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-04-23 06:14:43 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-05-06 20:40:58 +1000 |
| commit | 944d063a3e735f92f25383af9cb23d4e9be3a9c3 (patch) | |
| tree | 18fb0424a9d631c7a1eaacb4e527ddd507a7f37e /ctdb/config/functions | |
| parent | 577a3cae5d14eede627728ea6b75d4a182106182 (diff) | |
| download | samba-944d063a3e735f92f25383af9cb23d4e9be3a9c3.tar.gz samba-944d063a3e735f92f25383af9cb23d4e9be3a9c3.tar.xz samba-944d063a3e735f92f25383af9cb23d4e9be3a9c3.zip | |
Revert "Eventscript functions: add optional version to nfs_check_rpc_service()"
This reverts commit 92f74fd589467b46c758e116e97417edfe8773d7.
This change is unused and is just complicating the function.
Conflicts:
config/functions
(This used to be ctdb commit 77302dbfd85754e02559eccb2dd6c090db0b6b9f)
Diffstat (limited to 'ctdb/config/functions')
| -rwxr-xr-x | ctdb/config/functions | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions index 07ac715806c..c90ddb0c9de 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -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" ;; |