|
 |
b4b3ce |
From c70924b69af760ec3762b01594afb6ff82c3820c Mon Sep 17 00:00:00 2001
|
|
|
b4b3ce |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
b4b3ce |
Date: Wed, 19 Sep 2018 16:13:43 +0200
|
|
|
b4b3ce |
Subject: [PATCH] systemd-tmpfiles: configure path with --with-rsctmpdir
|
|
|
b4b3ce |
|
|
|
b4b3ce |
---
|
|
|
b4b3ce |
configure.ac | 3 ++-
|
|
|
b4b3ce |
systemd/resource-agents.conf | 1 -
|
|
|
b4b3ce |
systemd/resource-agents.conf.in | 1 +
|
|
|
b4b3ce |
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
b4b3ce |
delete mode 100644 systemd/resource-agents.conf
|
|
|
b4b3ce |
create mode 100644 systemd/resource-agents.conf.in
|
|
|
b4b3ce |
|
|
|
b4b3ce |
diff --git a/configure.ac b/configure.ac
|
|
|
b4b3ce |
index b7ffb99f3..e34d125e9 100644
|
|
|
b4b3ce |
--- a/configure.ac
|
|
|
b4b3ce |
+++ b/configure.ac
|
|
|
b4b3ce |
@@ -431,7 +431,7 @@ AC_SUBST(HA_VARRUNDIR)
|
|
|
b4b3ce |
|
|
|
b4b3ce |
# Expand $prefix
|
|
|
b4b3ce |
eval HA_RSCTMPDIR="`eval echo ${HA_RSCTMPDIR}`"
|
|
|
b4b3ce |
-AC_DEFINE_UNQUOTED(HA_RSCTMPDIR,"$HA_RSCTMPDIR", Where Resouce agents keep state files)
|
|
|
b4b3ce |
+AC_DEFINE_UNQUOTED(HA_RSCTMPDIR,"$HA_RSCTMPDIR", Where Resource agents keep state files)
|
|
|
b4b3ce |
AC_SUBST(HA_RSCTMPDIR)
|
|
|
b4b3ce |
|
|
|
b4b3ce |
dnl Eventually move out of the heartbeat dir tree and create symlinks when needed
|
|
|
b4b3ce |
@@ -911,6 +911,7 @@ heartbeat/Makefile \
|
|
|
b4b3ce |
heartbeat/ocf-shellfuncs \
|
|
|
b4b3ce |
heartbeat/shellfuncs \
|
|
|
b4b3ce |
systemd/Makefile \
|
|
|
b4b3ce |
+ systemd/resource-agents.conf \
|
|
|
b4b3ce |
tools/Makefile \
|
|
|
b4b3ce |
tools/ocf-tester \
|
|
|
b4b3ce |
tools/ocft/Makefile \
|
|
|
b4b3ce |
diff --git a/systemd/resource-agents.conf b/systemd/resource-agents.conf
|
|
|
b4b3ce |
deleted file mode 100644
|
|
|
b4b3ce |
index 1cb129c18..000000000
|
|
|
b4b3ce |
--- a/systemd/resource-agents.conf
|
|
|
b4b3ce |
+++ /dev/null
|
|
|
b4b3ce |
@@ -1 +0,0 @@
|
|
|
b4b3ce |
-d /var/run/resource-agents/ 1755 root root
|
|
|
b4b3ce |
diff --git a/systemd/resource-agents.conf.in b/systemd/resource-agents.conf.in
|
|
|
b4b3ce |
new file mode 100644
|
|
|
b4b3ce |
index 000000000..7bd157ec0
|
|
|
b4b3ce |
--- /dev/null
|
|
|
b4b3ce |
+++ b/systemd/resource-agents.conf.in
|
|
|
b4b3ce |
@@ -0,0 +1 @@
|
|
|
b4b3ce |
+d @HA_RSCTMPDIR@ 1755 root root
|