| From 531178d7fbb5d4b3404766cfd0fc999398cccd58 Mon Sep 17 00:00:00 2001 |
| From: Amarnath Valluri <amarnath.valluri@intel.com> |
| Date: Wed, 8 Feb 2017 18:39:48 +0200 |
| Subject: [PATCH] Added configure variable for placing systemd untis location |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> |
| --- |
| configure.ac | 3 +++ |
| daemon/Makefile.am | 1 - |
| tools/Makefile.am | 1 - |
| 3 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 0e5b8e3..5a6408c 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -2687,6 +2687,9 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] |
| AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) |
| AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) |
| |
| +AC_ARG_VAR(SYSTEMD_UNIT_DIR, 'location for systemd units, defautls to /lib/systemd/system') |
| +AS_IF([test "x$SYSTEMD_UNIT_DIR" = "x"], [SYSTEMD_UNIT_DIR="/lib/systemd/system"]) |
| + |
| AC_CONFIG_FILES([run], |
| [chmod +x,-w run]) |
| AC_CONFIG_FILES([\ |
| diff --git a/daemon/Makefile.am b/daemon/Makefile.am |
| index edb75e8..2ab42a6 100644 |
| --- a/daemon/Makefile.am |
| +++ b/daemon/Makefile.am |
| @@ -449,7 +449,6 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART |
| |
| if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| |
| -SYSTEMD_UNIT_DIR = /lib/systemd/system |
| BUILT_SOURCES += libvirtd.service |
| |
| install-init-systemd: install-sysconfig libvirtd.service |
| diff --git a/tools/Makefile.am b/tools/Makefile.am |
| index 27ecbf1..8cefe1a 100644 |
| --- a/tools/Makefile.am |
| +++ b/tools/Makefile.am |
| @@ -380,7 +380,6 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh |
| |
| |
| EXTRA_DIST += libvirt-guests.service.in |
| -SYSTEMD_UNIT_DIR = /lib/systemd/system |
| |
| if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
| -- |
| 2.7.4 |
| |