31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 1317efc72af6b72d9fb37aea18dc16129c146148 Mon Sep 17 00:00:00 2001
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
Date: Tue, 25 Jun 2024 13:33:19 +0200
|
|
Subject: [PATCH] Filesystem: return success during stop-action when leading or
|
|
trailing whitespace is present in device or directory parameters
|
|
|
|
---
|
|
heartbeat/Filesystem | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
|
index 8e0127531..3eb520e0c 100755
|
|
--- a/heartbeat/Filesystem
|
|
+++ b/heartbeat/Filesystem
|
|
@@ -1037,6 +1037,7 @@ fi
|
|
DEVICE="$OCF_RESKEY_device"
|
|
case "$DEVICE" in
|
|
[[:space:]]*|*[[:space:]])
|
|
+ [ "$__OCF_ACTION" = "stop" ] && exit $OCF_SUCCESS
|
|
ocf_exit_reason "device parameter does not accept leading or trailing whitespace characters"
|
|
exit $OCF_ERR_CONFIGURED
|
|
;;
|
|
@@ -1080,6 +1081,7 @@ else
|
|
: ${MOUNTPOINT:=/}
|
|
case "$MOUNTPOINT" in
|
|
[[:space:]]*|*[[:space:]])
|
|
+ [ "$__OCF_ACTION" = "stop" ] && exit $OCF_SUCCESS
|
|
ocf_exit_reason "directory parameter does not accept leading or trailing whitespace characters"
|
|
exit $OCF_ERR_CONFIGURED
|
|
;;
|