1From 69011c7227ad1aaf08d5ab28e46f85dac951c597 Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Thu, 21 Apr 2022 17:22:35 +0800 4Subject: [PATCH] drbd-utils: support usermerge 5 6Upstream-Status: Inappropriate[oe-specific] 7 8Signed-off-by: Changqing Li <changqing.li@windriver.com> 9Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> 10--- 11 configure.ac | 2 +- 12 scripts/Makefile.in | 10 +++++----- 13 scripts/drbd-demote-or-escalate@.service | 2 +- 14 scripts/drbd-promote@.service | 4 ++-- 15 scripts/drbd-wait-promotable@.service | 2 +- 16 scripts/drbd.service | 6 +++--- 17 scripts/drbd@.service | 6 +++--- 18 scripts/ocf.ra@.service | 4 ++-- 19 user/v83/Makefile.in | 14 +++++++------- 20 user/v84/Makefile.in | 14 +++++++------- 21 10 files changed, 32 insertions(+), 32 deletions(-) 22 23diff --git a/configure.ac b/configure.ac 24index ae575586..3d7deeae 100644 25--- a/configure.ac 26+++ b/configure.ac 27@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, 28 AC_SUBST(tmpfilesdir) 29 30 # set default early 31-default_udevdir=/lib/udev 32+default_udevdir=${prefix}/lib/udev 33 if test x"$with_udev" = x || \ 34 test x"$with_udev" = xyes ; then 35 if test x"$PKG_CONFIG" != x; then 36diff --git a/scripts/Makefile.in b/scripts/Makefile.in 37index fcd298e9..bab441a5 100644 38--- a/scripts/Makefile.in 39+++ b/scripts/Makefile.in 40@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) 41 install -d $(DESTDIR)$(systemdunitdir) 42 install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ 43 install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ 44- install -d $(DESTDIR)/lib/drbd/scripts 45- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts 46- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts 47- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts 48- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts 49+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts 50+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts 51+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 52+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 53+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 54 install -d $(DESTDIR)$(tmpfilesdir)/ 55 install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf 56 endif 57diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service 58index 20932238..8b5ce4a2 100644 59--- a/scripts/drbd-demote-or-escalate@.service 60+++ b/scripts/drbd-demote-or-escalate@.service 61@@ -28,5 +28,5 @@ TimeoutSec=60 62 # "Type=forking" would be an option to have it retry a number of times, 63 # and then only escalate to FailureAction if that did not help. 64 Type=oneshot 65-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I 66+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I 67 ExecStopPost=-/bin/journalctl --sync 68diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service 69index 71345d9b..678e0703 100644 70--- a/scripts/drbd-promote@.service 71+++ b/scripts/drbd-promote@.service 72@@ -24,5 +24,5 @@ RemainAfterExit=yes 73 # (ab)using systemd features 74 # if we cannot configure and promote, that's a condition, not a failure 75 # See the comment above wrt. FailureAction vs OnFailure 76-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I 77-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I 78+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I 79+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I 80diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service 81index 81c3789f..3416abc6 100644 82--- a/scripts/drbd-wait-promotable@.service 83+++ b/scripts/drbd-wait-promotable@.service 84@@ -10,7 +10,7 @@ Type=oneshot 85 86 # on first start, wait for access to "good data" 87 # let systemd handle timeouts 88-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I 89+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I 90 RemainAfterExit=yes 91 92 [Install] 93diff --git a/scripts/drbd.service b/scripts/drbd.service 94index 96c599e7..c81e95a6 100644 95--- a/scripts/drbd.service 96+++ b/scripts/drbd.service 97@@ -12,11 +12,11 @@ RemainAfterExit=yes 98 # A check for INIT_VERSION already exists, just set it to something. 99 Environment=INIT_VERSION=systemd 100 101-ExecStart=/lib/drbd/scripts/drbd start 102-ExecStop=/lib/drbd/scripts/drbd stop 103+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start 104+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop 105 106 # Re-adjust everything on reload 107-ExecReload=/lib/drbd/scripts/drbd reload 108+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload 109 110 [Install] 111 WantedBy=multi-user.target 112diff --git a/scripts/drbd@.service b/scripts/drbd@.service 113index 76514c5b..e2e500ba 100644 114--- a/scripts/drbd@.service 115+++ b/scripts/drbd@.service 116@@ -35,8 +35,8 @@ RemainAfterExit=yes 117 118 # depends... do we want this as ExecCondition or as ExecStart 119 # failed start is "failed", failed condition is just "not startable yet" 120-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I 121-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I 122+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I 123+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I 124 125 # can only succeed, if you first stop all depending services 126-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I 127+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I 128diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service 129index 9c2268a6..1666c482 100644 130--- a/scripts/ocf.ra@.service 131+++ b/scripts/ocf.ra@.service 132@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 133 # Only the first argument is used by the wrapper, 134 # the %n is just to identify which is which in the process list. 135 # All parameterization is done via Environment= in per instance override.conf 136-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n 137-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n 138+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n 139+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n 140diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in 141index 08cfe574..4c4971b6 100644 142--- a/user/v83/Makefile.in 143+++ b/user/v83/Makefile.in 144@@ -96,19 +96,19 @@ install: 145 ifeq ($(WITH_83_SUPPORT),yes) 146 install -d $(DESTDIR)$(localstatedir)/lib/drbd 147 install -d $(DESTDIR)$(localstatedir)/lock 148- install -d $(DESTDIR)/lib/drbd/ 149+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 150 if getent group haclient > /dev/null 2> /dev/null ; then \ 151- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 152- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 153+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 154+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 155 else \ 156- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 157- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 158+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 159+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 160 fi 161 endif 162 163 uninstall: 164- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 165- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 166+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 167+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 168 169 .PHONY: install uninstall clean distclean 170 ../../configure: 171diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in 172index 0fcefc5f..81f7d5ec 100644 173--- a/user/v84/Makefile.in 174+++ b/user/v84/Makefile.in 175@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) 176 install -d $(DESTDIR)$(localstatedir)/lib/drbd 177 install -d $(DESTDIR)$(localstatedir)/run/drbd 178 install -d $(DESTDIR)$(localstatedir)/lock 179- install -d $(DESTDIR)/lib/drbd/ 180+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 181 if getent group haclient > /dev/null 2> /dev/null ; then \ 182- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 183- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 184+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 185+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 186 else \ 187- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 188- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 189+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 190+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 191 fi 192 endif 193 194 uninstall: 195- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 196- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 197+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 198+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 199 200 spell: 201 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ 202-- 2032.25.1 204 205