1*b58112e5SPatrick WilliamsFrom 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 2c1d34338SBrad BishopFrom: Changqing Li <changqing.li@windriver.com> 303907ee1SPatrick WilliamsDate: Thu, 21 Apr 2022 17:22:35 +0800 403907ee1SPatrick WilliamsSubject: [PATCH] drbd-utils: support usermerge 5c1d34338SBrad Bishop 6c1d34338SBrad BishopUpstream-Status: Inappropriate [oe-specific] 7c1d34338SBrad Bishop 8c1d34338SBrad BishopSigned-off-by: Changqing Li <changqing.li@windriver.com> 958776373SPatrick WilliamsSigned-off-by: Sakib Sajal <sakib.sajal@windriver.com> 10c1d34338SBrad Bishop--- 11c1d34338SBrad Bishop configure.ac | 2 +- 1258776373SPatrick Williams scripts/Makefile.in | 10 +++++----- 1303907ee1SPatrick Williams scripts/drbd-demote-or-escalate@.service | 2 +- 1403907ee1SPatrick Williams scripts/drbd-promote@.service | 4 ++-- 1503907ee1SPatrick Williams scripts/drbd-wait-promotable@.service | 2 +- 1603907ee1SPatrick Williams scripts/drbd.service | 6 +++--- 1703907ee1SPatrick Williams scripts/drbd@.service | 6 +++--- 1803907ee1SPatrick Williams scripts/ocf.ra@.service | 4 ++-- 19c1d34338SBrad Bishop user/v83/Makefile.in | 14 +++++++------- 20c1d34338SBrad Bishop user/v84/Makefile.in | 14 +++++++------- 2103907ee1SPatrick Williams 10 files changed, 32 insertions(+), 32 deletions(-) 22c1d34338SBrad Bishop 23c1d34338SBrad Bishopdiff --git a/configure.ac b/configure.ac 24*b58112e5SPatrick Williamsindex f1d69ea3..3289ac7d 100644 25c1d34338SBrad Bishop--- a/configure.ac 26c1d34338SBrad Bishop+++ b/configure.ac 27*b58112e5SPatrick Williams@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, 28c1d34338SBrad Bishop AC_SUBST(tmpfilesdir) 29c1d34338SBrad Bishop 30c1d34338SBrad Bishop # set default early 31c1d34338SBrad Bishop-default_udevdir=/lib/udev 32c1d34338SBrad Bishop+default_udevdir=${prefix}/lib/udev 33c1d34338SBrad Bishop if test x"$with_udev" = x || \ 34c1d34338SBrad Bishop test x"$with_udev" = xyes ; then 35c1d34338SBrad Bishop if test x"$PKG_CONFIG" != x; then 36c1d34338SBrad Bishopdiff --git a/scripts/Makefile.in b/scripts/Makefile.in 37*b58112e5SPatrick Williamsindex aca15a22..a1cd2ffe 100644 38c1d34338SBrad Bishop--- a/scripts/Makefile.in 39c1d34338SBrad Bishop+++ b/scripts/Makefile.in 40*b58112e5SPatrick Williams@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) 41c1d34338SBrad Bishop install -d $(DESTDIR)$(systemdunitdir) 42*b58112e5SPatrick Williams install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ 4358776373SPatrick Williams install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ 4458776373SPatrick Williams- install -d $(DESTDIR)/lib/drbd/scripts 4558776373SPatrick Williams- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts 4658776373SPatrick Williams- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts 4758776373SPatrick Williams- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts 4858776373SPatrick Williams- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts 4903907ee1SPatrick Williams+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts 5003907ee1SPatrick Williams+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts 5103907ee1SPatrick Williams+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 5203907ee1SPatrick Williams+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 5303907ee1SPatrick Williams+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts 54c1d34338SBrad Bishop install -d $(DESTDIR)$(tmpfilesdir)/ 55c1d34338SBrad Bishop install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf 56c1d34338SBrad Bishop endif 5703907ee1SPatrick Williamsdiff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service 5803907ee1SPatrick Williamsindex 20932238..8b5ce4a2 100644 5903907ee1SPatrick Williams--- a/scripts/drbd-demote-or-escalate@.service 6003907ee1SPatrick Williams+++ b/scripts/drbd-demote-or-escalate@.service 6103907ee1SPatrick Williams@@ -28,5 +28,5 @@ TimeoutSec=60 6203907ee1SPatrick Williams # "Type=forking" would be an option to have it retry a number of times, 6303907ee1SPatrick Williams # and then only escalate to FailureAction if that did not help. 6403907ee1SPatrick Williams Type=oneshot 6503907ee1SPatrick Williams-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I 6603907ee1SPatrick Williams+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I 6703907ee1SPatrick Williams ExecStopPost=-/bin/journalctl --sync 6803907ee1SPatrick Williamsdiff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service 6903907ee1SPatrick Williamsindex 71345d9b..678e0703 100644 7003907ee1SPatrick Williams--- a/scripts/drbd-promote@.service 7103907ee1SPatrick Williams+++ b/scripts/drbd-promote@.service 7203907ee1SPatrick Williams@@ -24,5 +24,5 @@ RemainAfterExit=yes 7303907ee1SPatrick Williams # (ab)using systemd features 7403907ee1SPatrick Williams # if we cannot configure and promote, that's a condition, not a failure 7503907ee1SPatrick Williams # See the comment above wrt. FailureAction vs OnFailure 7603907ee1SPatrick Williams-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I 7703907ee1SPatrick Williams-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I 7803907ee1SPatrick Williams+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I 7903907ee1SPatrick Williams+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I 8003907ee1SPatrick Williamsdiff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service 8103907ee1SPatrick Williamsindex 81c3789f..3416abc6 100644 8203907ee1SPatrick Williams--- a/scripts/drbd-wait-promotable@.service 8303907ee1SPatrick Williams+++ b/scripts/drbd-wait-promotable@.service 8403907ee1SPatrick Williams@@ -10,7 +10,7 @@ Type=oneshot 8503907ee1SPatrick Williams 8603907ee1SPatrick Williams # on first start, wait for access to "good data" 8703907ee1SPatrick Williams # let systemd handle timeouts 8803907ee1SPatrick Williams-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I 8903907ee1SPatrick Williams+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I 9003907ee1SPatrick Williams RemainAfterExit=yes 9103907ee1SPatrick Williams 9203907ee1SPatrick Williams [Install] 9303907ee1SPatrick Williamsdiff --git a/scripts/drbd.service b/scripts/drbd.service 9403907ee1SPatrick Williamsindex 96c599e7..c81e95a6 100644 9503907ee1SPatrick Williams--- a/scripts/drbd.service 9603907ee1SPatrick Williams+++ b/scripts/drbd.service 9703907ee1SPatrick Williams@@ -12,11 +12,11 @@ RemainAfterExit=yes 9803907ee1SPatrick Williams # A check for INIT_VERSION already exists, just set it to something. 9903907ee1SPatrick Williams Environment=INIT_VERSION=systemd 10003907ee1SPatrick Williams 10103907ee1SPatrick Williams-ExecStart=/lib/drbd/scripts/drbd start 10203907ee1SPatrick Williams-ExecStop=/lib/drbd/scripts/drbd stop 10303907ee1SPatrick Williams+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start 10403907ee1SPatrick Williams+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop 10503907ee1SPatrick Williams 10603907ee1SPatrick Williams # Re-adjust everything on reload 10703907ee1SPatrick Williams-ExecReload=/lib/drbd/scripts/drbd reload 10803907ee1SPatrick Williams+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload 10903907ee1SPatrick Williams 11003907ee1SPatrick Williams [Install] 11103907ee1SPatrick Williams WantedBy=multi-user.target 11203907ee1SPatrick Williamsdiff --git a/scripts/drbd@.service b/scripts/drbd@.service 113*b58112e5SPatrick Williamsindex 0fad10be..556f3857 100644 11403907ee1SPatrick Williams--- a/scripts/drbd@.service 11503907ee1SPatrick Williams+++ b/scripts/drbd@.service 11603907ee1SPatrick Williams@@ -35,8 +35,8 @@ RemainAfterExit=yes 11703907ee1SPatrick Williams 11803907ee1SPatrick Williams # depends... do we want this as ExecCondition or as ExecStart 11903907ee1SPatrick Williams # failed start is "failed", failed condition is just "not startable yet" 12003907ee1SPatrick Williams-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I 12103907ee1SPatrick Williams-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I 12203907ee1SPatrick Williams+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I 12303907ee1SPatrick Williams+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I 12403907ee1SPatrick Williams 12503907ee1SPatrick Williams # can only succeed, if you first stop all depending services 12603907ee1SPatrick Williams-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I 12703907ee1SPatrick Williams+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I 12803907ee1SPatrick Williamsdiff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service 12903907ee1SPatrick Williamsindex 9c2268a6..1666c482 100644 13003907ee1SPatrick Williams--- a/scripts/ocf.ra@.service 13103907ee1SPatrick Williams+++ b/scripts/ocf.ra@.service 13203907ee1SPatrick Williams@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 13303907ee1SPatrick Williams # Only the first argument is used by the wrapper, 13403907ee1SPatrick Williams # the %n is just to identify which is which in the process list. 13503907ee1SPatrick Williams # All parameterization is done via Environment= in per instance override.conf 13603907ee1SPatrick Williams-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n 13703907ee1SPatrick Williams-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n 13803907ee1SPatrick Williams+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n 13903907ee1SPatrick Williams+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n 140c1d34338SBrad Bishopdiff --git a/user/v83/Makefile.in b/user/v83/Makefile.in 14158776373SPatrick Williamsindex 08cfe574..4c4971b6 100644 142c1d34338SBrad Bishop--- a/user/v83/Makefile.in 143c1d34338SBrad Bishop+++ b/user/v83/Makefile.in 144c1d34338SBrad Bishop@@ -96,19 +96,19 @@ install: 145c1d34338SBrad Bishop ifeq ($(WITH_83_SUPPORT),yes) 146c1d34338SBrad Bishop install -d $(DESTDIR)$(localstatedir)/lib/drbd 147c1d34338SBrad Bishop install -d $(DESTDIR)$(localstatedir)/lock 148c1d34338SBrad Bishop- install -d $(DESTDIR)/lib/drbd/ 149c1d34338SBrad Bishop+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 150c1d34338SBrad Bishop if getent group haclient > /dev/null 2> /dev/null ; then \ 151c1d34338SBrad Bishop- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 152c1d34338SBrad Bishop- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 153c1d34338SBrad Bishop+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 154c1d34338SBrad Bishop+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 155c1d34338SBrad Bishop else \ 156c1d34338SBrad Bishop- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 157c1d34338SBrad Bishop- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 158c1d34338SBrad Bishop+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 159c1d34338SBrad Bishop+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 160c1d34338SBrad Bishop fi 161c1d34338SBrad Bishop endif 162c1d34338SBrad Bishop 163c1d34338SBrad Bishop uninstall: 164c1d34338SBrad Bishop- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 165c1d34338SBrad Bishop- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 166c1d34338SBrad Bishop+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 167c1d34338SBrad Bishop+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 168c1d34338SBrad Bishop 169c1d34338SBrad Bishop .PHONY: install uninstall clean distclean 170c1d34338SBrad Bishop ../../configure: 171c1d34338SBrad Bishopdiff --git a/user/v84/Makefile.in b/user/v84/Makefile.in 17258776373SPatrick Williamsindex 0fcefc5f..81f7d5ec 100644 173c1d34338SBrad Bishop--- a/user/v84/Makefile.in 174c1d34338SBrad Bishop+++ b/user/v84/Makefile.in 17558776373SPatrick Williams@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) 176c1d34338SBrad Bishop install -d $(DESTDIR)$(localstatedir)/lib/drbd 177c1d34338SBrad Bishop install -d $(DESTDIR)$(localstatedir)/run/drbd 178c1d34338SBrad Bishop install -d $(DESTDIR)$(localstatedir)/lock 179c1d34338SBrad Bishop- install -d $(DESTDIR)/lib/drbd/ 180c1d34338SBrad Bishop+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 181c1d34338SBrad Bishop if getent group haclient > /dev/null 2> /dev/null ; then \ 182c1d34338SBrad Bishop- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 183c1d34338SBrad Bishop- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 184c1d34338SBrad Bishop+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 185c1d34338SBrad Bishop+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 186c1d34338SBrad Bishop else \ 187c1d34338SBrad Bishop- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 188c1d34338SBrad Bishop- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 189c1d34338SBrad Bishop+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 190c1d34338SBrad Bishop+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 191c1d34338SBrad Bishop fi 192c1d34338SBrad Bishop endif 193c1d34338SBrad Bishop 194c1d34338SBrad Bishop uninstall: 195c1d34338SBrad Bishop- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 196c1d34338SBrad Bishop- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 197c1d34338SBrad Bishop+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 198c1d34338SBrad Bishop+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 199c1d34338SBrad Bishop 200c1d34338SBrad Bishop spell: 201c1d34338SBrad Bishop for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ 202