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