4e69252716
- Revert "Build: configure: make systemd detection akin to + before Upstart one" * pacemaker-configure-systemd-detection.patch - libcrmcommon: fix CVE-2016-7035 (improper IPC guarding) (bsc#1007433) - various: issues discovered via valgrind and coverity - attrd_updater: fix usage of HAVE_ATOMIC_ATTRD - Upstream version cs: b6f251a13fadca0cb74702b0c007a55275c8ea09 - Rebase: * pacemaker-NodeUtilization-RA.patch - extra: add resource agent for managing a node attribute - crmd: cl#5185 - Record pending operations in the CIB before they are performed (bsc#1003565) - ClusterMon: fix to avoid matching other process with the same PID - mcp: improve comments for sysconfig options - spec: require libqb >= 0.13.0 - tools: crm_standby --version/--help should work without cluster - spec: reorganize so %pre etc. blocks are self-contained - spec: require python >= 2.6 - spec: comment better - libpengine: ensure child is not null before looking up value - libpengine: only log startup-fencing warning once - Upstream version cs: 722276c442bf023931842313bfe0dfb7d90a7c15 - pacemaker.service: do not mistakenly suggest killing fenced - pacemaker.spec: consume "systemdunitdir" via %_unitdir - libcrmcommon: report errors consistently when waiting for data on connection (bsc#986644) - libservices: use DBusError API properly - remote: Correctly calculate the remaining timeouts when receiving messages (bsc#986644) - libfencing: report added node ID correctly - crm_mon: Do not call setenv with null value - pacemaker_remote: allow remote clients to timeout/reconnect OBS-URL: https://build.opensuse.org/request/show/439181 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=255
107 lines
3.5 KiB
Diff
107 lines
3.5 KiB
Diff
Index: pacemaker-1.1.15+git20161104.b6f251a/configure.ac
|
|
===================================================================
|
|
--- pacemaker-1.1.15+git20161104.b6f251a.orig/configure.ac
|
|
+++ pacemaker-1.1.15+git20161104.b6f251a/configure.ac
|
|
@@ -1214,58 +1214,6 @@ AC_SUBST(DBUS_LIBS)
|
|
|
|
AC_CHECK_TYPES([DBusBasicValue],,,[[#include <dbus/dbus.h>]])
|
|
|
|
-if test "x${enable_systemd}" != xno; then
|
|
- if test $HAVE_dbus = 0; then
|
|
- if test "x${enable_systemd}" = xyes; then
|
|
- AC_MSG_FAILURE([cannot enable systemd without DBus])
|
|
- else
|
|
- enable_systemd=no
|
|
- fi
|
|
- fi
|
|
- if test "x${enable_systemd}" = xtry; then
|
|
- AC_MSG_CHECKING([for systemd version query result via dbus-send])
|
|
- ret=$({ dbus-send --system --print-reply \
|
|
- --dest=org.freedesktop.systemd1 \
|
|
- /org/freedesktop/systemd1 \
|
|
- org.freedesktop.DBus.Properties.Get \
|
|
- string:org.freedesktop.systemd1.Manager \
|
|
- string:Version 2>/dev/null \
|
|
- || echo "this borked"; } | tail -n1)
|
|
- # sanitize output a bit (interested just in value, not type),
|
|
- # ret is intentionally unenquoted so as to normalize whitespace
|
|
- ret=$(echo ${ret} | cut -d' ' -f2-)
|
|
- AC_MSG_RESULT([${ret}])
|
|
- if test "x${ret}" != xborked \
|
|
- || systemctl --version 2>/dev/null | grep -q systemd; then
|
|
- enable_systemd=yes
|
|
- else
|
|
- enable_systemd=no
|
|
- fi
|
|
- fi
|
|
-fi
|
|
-
|
|
-AC_MSG_CHECKING([whether to enable support for managing resources via systemd])
|
|
-AC_MSG_RESULT([${enable_systemd}])
|
|
-if test "x${enable_systemd}" = xyes; then
|
|
- HAVE_systemd=1
|
|
- PCMK_FEATURES="$PCMK_FEATURES systemd"
|
|
-
|
|
- AC_MSG_CHECKING([for systemd path for system unit files])
|
|
- systemdunitdir="${systemdunitdir:}"
|
|
- PKG_CHECK_VAR([systemdunitdir], [systemd],
|
|
- [systemdsystemunitdir], [],[
|
|
- systemdunitdir=no
|
|
- ])
|
|
- AC_MSG_RESULT([${systemdunitdir}])
|
|
- if test "x${systemdunitdir}" = xno; then
|
|
- AC_MSG_FAILURE([cannot enable systemd when systemdunitdir unresolved])
|
|
- fi
|
|
-fi
|
|
-
|
|
-AC_DEFINE_UNQUOTED(SUPPORT_SYSTEMD, $HAVE_systemd, Support systemd based system services)
|
|
-AM_CONDITIONAL(BUILD_SYSTEMD, test $HAVE_systemd = 1)
|
|
-AC_SUBST(SUPPORT_SYSTEMD)
|
|
-
|
|
if test "x${enable_upstart}" != xno; then
|
|
if test $HAVE_dbus = 0; then
|
|
if test "x${enable_upstart}" = xyes; then
|
|
@@ -1303,6 +1251,42 @@ AC_DEFINE_UNQUOTED(SUPPORT_UPSTART, $HAV
|
|
AM_CONDITIONAL(BUILD_UPSTART, test $HAVE_upstart = 1)
|
|
AC_SUBST(SUPPORT_UPSTART)
|
|
|
|
+if test "x${enable_systemd}" != xno; then
|
|
+ if test $HAVE_dbus = 0; then
|
|
+ if test "x${enable_systemd}" = xyes; then
|
|
+ AC_MSG_FAILURE([cannot enable systemd without DBus])
|
|
+ else
|
|
+ enable_systemd=no
|
|
+ fi
|
|
+ else
|
|
+ AC_MSG_CHECKING([for systemd path for system unit files])
|
|
+ PKG_CHECK_VAR([systemdunitdir], [systemd], [systemdsystemunitdir], [
|
|
+ AC_MSG_RESULT([${systemdunitdir}])
|
|
+ ],[
|
|
+ AC_MSG_RESULT([not found])
|
|
+ systemdunitdir=no
|
|
+ ])
|
|
+ if test "x${systemdunitdir}" = xno; then
|
|
+ if test "x${enable_systemd}" = xyes; then
|
|
+ AC_MSG_FAILURE([cannot enable systemd when systemdunitdir unresolved])
|
|
+ fi
|
|
+ enable_systemd=no
|
|
+ else
|
|
+ enable_systemd=yes
|
|
+ fi
|
|
+ fi
|
|
+fi
|
|
+
|
|
+AC_MSG_CHECKING([whether to enable support for managing resources via systemd])
|
|
+AC_MSG_RESULT([${enable_systemd}])
|
|
+if test "x${enable_systemd}" = xyes; then
|
|
+ HAVE_systemd=1
|
|
+ PCMK_FEATURES="$PCMK_FEATURES systemd"
|
|
+fi
|
|
+
|
|
+AC_DEFINE_UNQUOTED(SUPPORT_SYSTEMD, $HAVE_systemd, Support systemd based system services)
|
|
+AM_CONDITIONAL(BUILD_SYSTEMD, test $HAVE_systemd = 1)
|
|
+AC_SUBST(SUPPORT_SYSTEMD)
|
|
|
|
case $SUPPORT_NAGIOS in
|
|
1|yes|true|try)
|