55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
|
From d649490dfb30e89dd725d200283f0b9848d24f61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: rpm-build <rpm-build>
|
||
|
|
Date: Thu, 29 Feb 2024 16:42:28 +0800
|
||
|
|
Subject: [PATCH] pacemaker: Use long format for crm_ticket -v
|
||
|
|
|
||
|
|
---
|
||
|
|
src/pacemaker.c | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/pacemaker.c b/src/pacemaker.c
|
||
|
|
index cef8c41..8ad3c69 100644
|
||
|
|
--- a/src/pacemaker.c
|
||
|
|
+++ b/src/pacemaker.c
|
||
|
|
@@ -46,7 +46,7 @@ enum atomic_ticket_supported atomicity = UNKNOWN;
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
-#define COMMAND_MAX 1024
|
||
|
|
+#define COMMAND_MAX 2048
|
||
|
|
|
||
|
|
|
||
|
|
/** Determines whether the installed crm_ticket can do atomic ticket grants,
|
||
|
|
@@ -126,14 +126,14 @@ static int pcmk_write_ticket_atomic(struct ticket_config *tk, int grant)
|
||
|
|
int rv;
|
||
|
|
|
||
|
|
|
||
|
|
- /* The values are appended to "-v", so that NO_ONE
|
||
|
|
- * (which is -1) isn't seen as another option. */
|
||
|
|
+ /* The long format (--attr-value=) for attribute value is used instead of "-v",
|
||
|
|
+ * so that NO_ONE (which is -1) isn't seen as another option. */
|
||
|
|
snprintf(cmd, COMMAND_MAX,
|
||
|
|
"crm_ticket -t '%s' "
|
||
|
|
"%s --force "
|
||
|
|
- "-S owner -v%" PRIi32 " "
|
||
|
|
- "-S expires -v%" PRIi64 " "
|
||
|
|
- "-S term -v%" PRIi64,
|
||
|
|
+ "-S owner --attr-value=%" PRIi32 " "
|
||
|
|
+ "-S expires --attr-value=%" PRIi64 " "
|
||
|
|
+ "-S term --attr-value=%" PRIi64,
|
||
|
|
tk->name,
|
||
|
|
(grant > 0 ? "-g" :
|
||
|
|
grant < 0 ? "-r" :
|
||
|
|
@@ -232,7 +232,7 @@ static int pcmk_set_attr(struct ticket_config *tk, const char *attr, const char
|
||
|
|
char cmd[COMMAND_MAX];
|
||
|
|
|
||
|
|
snprintf(cmd, COMMAND_MAX,
|
||
|
|
- "crm_ticket -t '%s' -S '%s' -v '%s'",
|
||
|
|
+ "crm_ticket -t '%s' -S '%s' --attr-value='%s'",
|
||
|
|
tk->name, attr, val);
|
||
|
|
return _run_crm_ticket(cmd);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|