diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 21:04:41 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 21:04:41 +0000 |
| commit | b37ff8756eeb4882c7fcd5864c12b850d2983607 (patch) | |
| tree | c80a6f1066737bc4ea7f5e903494b1fcc6a031e9 /heartbeat/LVM-activate | |
| parent | Adding debian version 1:4.13.0-1. (diff) | |
| download | resource-agents-b37ff8756eeb4882c7fcd5864c12b850d2983607.tar.xz resource-agents-b37ff8756eeb4882c7fcd5864c12b850d2983607.zip | |
Merging upstream version 1:4.14.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'heartbeat/LVM-activate')
| -rwxr-xr-x | heartbeat/LVM-activate | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/heartbeat/LVM-activate b/heartbeat/LVM-activate index f6f24a3..3858ed8 100755 --- a/heartbeat/LVM-activate +++ b/heartbeat/LVM-activate @@ -448,6 +448,10 @@ systemid_check() { # system_id_source is set in lvm.conf source=$(lvmconfig 'global/system_id_source' 2>/dev/null | cut -d"=" -f2) + + # Is volume_list set in lvm.conf + vol_list=$(lvmconfig 'activation/volume_list' 2>/dev/null | cut -d"=" -f2) + if [ "$source" = "" ] || [ "$source" = "none" ]; then ocf_exit_reason "system_id_source in lvm.conf is not set correctly!" exit $OCF_ERR_ARGS @@ -458,6 +462,11 @@ systemid_check() exit $OCF_ERR_ARGS fi + if [ -n "$source" ] && [ -n "$vol_list" ]; then + ocf_exit_reason "Both system_id_source & volume_list cannot be defined!" + exit $OCF_ERR_ARGS + fi + return $OCF_SUCCESS } |