[patch] Patch for DRBD helper lib directory

drbd-utils-9.12.2-helperlibdir.patch (text/plain), 3.09 KB, created by Joe Khoobyar on 2020-05-05 16:28:26 UTC

diff -Naur drbd-utils-9.12.2-old/configure.ac drbd-utils-9.12.2/configure.ac
--- drbd-utils-9.12.2-old/configure.ac	2020-04-02 08:20:05.000000000 +0000
+++ drbd-utils-9.12.2/configure.ac	2020-05-05 15:20:05.167176959 +0000
@@ -219,6 +219,13 @@
 	[WITH_DRBDMON=$withval])
 AC_SUBST(WITH_DRBDMON)
 
+
+AC_ARG_WITH(helperlibdir,
+	AS_HELP_STRING([--with-helperlibdir=DIR],
+		[install helper lib binaries in DIR [[/lib/drbd]]]),
+		helperlibdir=$withval, helperlibdir='/lib/drbd')
+AC_SUBST(helperlibdir)
+
 dnl Checks for programs
 AC_PROG_CC
 AC_PROG_LN_S
@@ -440,6 +447,8 @@
 AC_SUBST(RPM_REQ_CHKCONFIG_PREUN)
 AC_SUBST(WITH_CLITEST)
 
+AH_TEMPLATE(DRBD_HELPER_LIB_DIR, [Helper tool directory. Commonly
+			         /lib/drbd or /usr/local/lib/drbd])
 AH_TEMPLATE(DRBD_LIB_DIR, [Local state directory. Commonly
 			  /var/lib/drbd or /usr/local/var/lib/drbd])
 AH_TEMPLATE(DRBD_RUN_DIR, [Runtime state directory. Commonly
@@ -456,12 +465,14 @@
 AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
 AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])
 
+AC_SUBST(DRBD_HELPER_LIB_DIR, [$helperlibdir])
 AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
 AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
 AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
 AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
 AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])
 
+AC_DEFINE_UNQUOTED(DRBD_HELPER_LIB_DIR, ["$DRBD_HELPER_LIB_DIR"])
 AC_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])
 AC_DEFINE_UNQUOTED(DRBD_RUN_DIR, ["$DRBD_RUN_DIR"])
 AC_DEFINE_UNQUOTED(DRBD_LOCK_DIR, ["$DRBD_LOCK_DIR"])
diff -Naur drbd-utils-9.12.2-old/user/shared/config.h.in drbd-utils-9.12.2/user/shared/config.h.in
--- drbd-utils-9.12.2-old/user/shared/config.h.in	2018-11-29 09:45:55.000000000 +0000
+++ drbd-utils-9.12.2/user/shared/config.h.in	2020-05-05 15:20:37.042923765 +0000
@@ -12,6 +12,9 @@
 /* Include support for drbd-8.4 kernel code */
 #undef DRBD_LEGACY_84
 
+/* Helper library binaries directory. Commonly /lib/drbd or /usr/local/lib/drbd */
+#undef DRBD_HELPER_LIB_DIR
+
 /* Local state directory. Commonly /var/lib/drbd or /usr/local/var/lib/drbd */
 #undef DRBD_LIB_DIR
 
diff -Naur drbd-utils-9.12.2-old/user/v84/drbdadm_usage_cnt.c drbd-utils-9.12.2/user/v84/drbdadm_usage_cnt.c
--- drbd-utils-9.12.2-old/user/v84/drbdadm_usage_cnt.c	2019-10-15 14:15:29.000000000 +0000
+++ drbd-utils-9.12.2/user/v84/drbdadm_usage_cnt.c	2020-05-05 15:22:09.946185822 +0000
@@ -285,7 +285,7 @@
 	m_asprintf(&new_path, "%s%s%s",
 			old_path,
 			old_path ? ":" : "",
-			"/lib/drbd");
+			DRBD_HELPER_LIB_DIR);
 	setenv("PATH", new_path, 1);
 }
 
diff -Naur drbd-utils-9.12.2-old/user/v9/drbdtool_common.c drbd-utils-9.12.2/user/v9/drbdtool_common.c
--- drbd-utils-9.12.2-old/user/v9/drbdtool_common.c	2018-12-13 10:40:24.000000000 +0000
+++ drbd-utils-9.12.2/user/v9/drbdtool_common.c	2020-05-05 15:21:35.046463038 +0000
@@ -333,7 +333,7 @@
 void add_lib_drbd_to_path(void)
 {
 		/* TODO: if exec-prefix != "/" ? */
-	add_component_to_path("/lib/drbd");
+	add_component_to_path(DRBD_HELPER_LIB_DIR);
 }
 
 /* from linux/crypto/crc32.c */