35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 69c5d35a7a5421d4728db824558007bbb91a9d4a Mon Sep 17 00:00:00 2001
|
|
From: Michele Baldessari <michele@acksyn.org>
|
|
Date: Wed, 12 Jun 2019 12:02:06 +0200
|
|
Subject: [PATCH] Remove unneeded podman exec --help call
|
|
|
|
There are no podman releases that do not have the exec argument, so
|
|
let's just drop this remnant that came from the docker RA.
|
|
|
|
Signed-off-by: Michele Baldessari <michele@acksyn.org>
|
|
---
|
|
heartbeat/podman | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/heartbeat/podman b/heartbeat/podman
|
|
index a9bd57dea..858023555 100755
|
|
--- a/heartbeat/podman
|
|
+++ b/heartbeat/podman
|
|
@@ -190,14 +190,8 @@ monitor_cmd_exec()
|
|
return $rc
|
|
fi
|
|
|
|
- if podman exec --help >/dev/null 2>&1; then
|
|
- out=$(podman exec ${CONTAINER} $OCF_RESKEY_monitor_cmd 2>&1)
|
|
- rc=$?
|
|
- else
|
|
- out=$(echo "$OCF_RESKEY_monitor_cmd" | nsenter --target $(podman inspect --format {{.State.Pid}} ${CONTAINER}) --mount --uts --ipc --net --pid 2>&1)
|
|
- rc=$?
|
|
- fi
|
|
-
|
|
+ out=$(podman exec ${CONTAINER} $OCF_RESKEY_monitor_cmd 2>&1)
|
|
+ rc=$?
|
|
if [ $rc -eq 127 ]; then
|
|
ocf_log err "monitor cmd failed (rc=$rc), output: $out"
|
|
ocf_exit_reason "monitor_cmd, ${OCF_RESKEY_monitor_cmd} , not found within container."
|