Dejan Muhamedagic
12 years ago
---
heartbeat/nfsserver | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index 003fcc6..09136d7 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -254,10 +254,6 @@ nfsserver_start ()
fi
if [ -n "$OCF_RESKEY_nfs_smnotify_retry_time" ]; then
- if ! ocf_is_decimal "$OCF_RESKEY_nfs_smnotify_retry_time"; then
- ocf_log err "Invalid OCF_RESKEY_nfs_smnotify_retry_time [$OCF_RESKEY_nfs_smnotify_retry_time]"
- return $OCF_ERR_CONFIGURED
- fi
opts="$opts -m $OCF_RESKEY_nfs_smnotify_retry_time"
fi
@@ -271,10 +267,6 @@ nfsserver_start ()
opts="$opts -n"
;;
- *)
- ocf_log err "Invalid OCF_RESKEY_nfs_notify_cmd [$OCF_RESKEY_nfs_notify_cmd]"
- return $OCF_ERR_CONFIGURED
- ;;
esac
rm -rf /var/lib/nfs/sm.ha.save > /dev/null 2>&1
@@ -324,6 +316,21 @@ nfsserver_validate ()
exit $OCF_ERR_CONFIGURED
fi
+ if [ -n "$OCF_RESKEY_nfs_smnotify_retry_time" ]; then
+ if ! ocf_is_decimal "$OCF_RESKEY_nfs_smnotify_retry_time"; then
+ ocf_log err "Invalid nfs_smnotify_retry_time [$OCF_RESKEY_nfs_smnotify_retry_time]"
+ exit $OCF_ERR_CONFIGURED
+ fi
+ fi
+
+ case ${OCF_RESKEY_nfs_notify_cmd##*/} in
+ sm-notify|rpc.statd) ;;
+ *)
+ ocf_log err "Invalid nfs_notify_cmd [$OCF_RESKEY_nfs_notify_cmd]"
+ exit $OCF_ERR_CONFIGURED
+ ;;
+ esac
+
return $OCF_SUCCESS
}
heartbeat/nfsserver | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index 003fcc6..09136d7 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -254,10 +254,6 @@ nfsserver_start ()
fi
if [ -n "$OCF_RESKEY_nfs_smnotify_retry_time" ]; then
- if ! ocf_is_decimal "$OCF_RESKEY_nfs_smnotify_retry_time"; then
- ocf_log err "Invalid OCF_RESKEY_nfs_smnotify_retry_time [$OCF_RESKEY_nfs_smnotify_retry_time]"
- return $OCF_ERR_CONFIGURED
- fi
opts="$opts -m $OCF_RESKEY_nfs_smnotify_retry_time"
fi
@@ -271,10 +267,6 @@ nfsserver_start ()
opts="$opts -n"
;;
- *)
- ocf_log err "Invalid OCF_RESKEY_nfs_notify_cmd [$OCF_RESKEY_nfs_notify_cmd]"
- return $OCF_ERR_CONFIGURED
- ;;
esac
rm -rf /var/lib/nfs/sm.ha.save > /dev/null 2>&1
@@ -324,6 +316,21 @@ nfsserver_validate ()
exit $OCF_ERR_CONFIGURED
fi
+ if [ -n "$OCF_RESKEY_nfs_smnotify_retry_time" ]; then
+ if ! ocf_is_decimal "$OCF_RESKEY_nfs_smnotify_retry_time"; then
+ ocf_log err "Invalid nfs_smnotify_retry_time [$OCF_RESKEY_nfs_smnotify_retry_time]"
+ exit $OCF_ERR_CONFIGURED
+ fi
+ fi
+
+ case ${OCF_RESKEY_nfs_notify_cmd##*/} in
+ sm-notify|rpc.statd) ;;
+ *)
+ ocf_log err "Invalid nfs_notify_cmd [$OCF_RESKEY_nfs_notify_cmd]"
+ exit $OCF_ERR_CONFIGURED
+ ;;
+ esac
+
return $OCF_SUCCESS
}
--
1.8.0
--4SFOXa2GPu3tIq4H--
1.8.0
--4SFOXa2GPu3tIq4H--