diff --git a/src/Makefile.am b/src/Makefile.am index d199190a40..9865b2d28e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,11 +35,9 @@ tapset_DATA = endif WITH_DTRACE_PROBES RPC_PROBE_FILES = LOGROTATE_FILES_IN = -SYSCONF_FILES = include security/Makefile.inc.am include access/Makefile.inc.am -include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include vbox/Makefile.inc.am @@ -205,23 +203,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemtap.py endif WITH_DTRACE_PROBES -install-sysconfig: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig - for f in $(SYSCONF_FILES:%.sysconf=%) ; \ - do \ - tgt=`basename $$f`; \ - $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ - done - -uninstall-sysconfig: - for f in $(SYSCONF_FILES:%.sysconf=%) ; \ - do \ - tgt=`basename $$f`; \ - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ - done - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : - LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) BUILT_SOURCES += $(LOGROTATE_FILES) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index f6626c7f49..06bd8f820b 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -3,9 +3,3 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) - -if WITH_INTERFACE - -SYSCONF_FILES += interface/virtinterfaced.sysconf - -endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index dbf0599b64..89e3ebdead 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -52,4 +52,9 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } + + sysconf_files += { + 'name': 'virtinterfaced', + 'file': files('virtinterfaced.sysconf'), + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 9a33eb5f06..0031adb2ef 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) if WITH_LIBXL -SYSCONF_FILES += libxl/virtxend.sysconf - INSTALL_DATA_DIRS += libxl install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index be644cab63..5c1a533cef 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -71,4 +71,9 @@ if conf.has('WITH_LIBXL') 'name': 'virtxend', 'in_file': files('virtxend.init.in'), } + + sysconf_files += { + 'name': 'virtxend', + 'file': files('virtxend.sysconf'), + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 8a0ecd8d1f..02ce2fa7a7 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,7 +1,6 @@ # vim: filetype=automake RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x -SYSCONF_FILES += locking/virtlockd.sysconf INSTALL_DATA_DIRS += locking diff --git a/src/locking/meson.build b/src/locking/meson.build index f560c9b44b..1d42682d60 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -149,6 +149,11 @@ if conf.has('WITH_LIBVIRTD') 'in_file': files('virtlockd.init.in'), } + sysconf_files += { + 'name': 'virtlockd', + 'file': files('virtlockd.sysconf'), + } + if conf.has('WITH_SANLOCK') virt_helpers += { 'name': 'libvirt_sanlock_helper', diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am deleted file mode 100644 index 48cae3add1..0000000000 --- a/src/logging/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=automake - -SYSCONF_FILES += logging/virtlogd.sysconf diff --git a/src/logging/meson.build b/src/logging/meson.build index a689ea5ab8..1f06a51e93 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -93,6 +93,11 @@ if conf.has('WITH_LIBVIRTD') 'name': 'virtlogd', 'in_file': files('virtlogd.init.in'), } + + sysconf_files += { + 'name': 'virtlogd', + 'file': files('virtlogd.sysconf'), + } endif log_inc_dir = include_directories('.') diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 3cf6f96ea1..f65b1cdf6b 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -11,8 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \ if WITH_LXC -SYSCONF_FILES += lxc/virtlxcd.sysconf - if WITH_DTRACE_PROBES RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 9117562e69..c8a5a9db9b 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -154,4 +154,9 @@ if conf.has('WITH_LXC') 'name': 'virtlxcd', 'in_file': files('virtlxcd.init.in'), } + + sysconf_files += { + 'name': 'virtlxcd', + 'file': files('virtlxcd.sysconf'), + } endif diff --git a/src/meson.build b/src/meson.build index b6a10ac265..58687b331a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -205,6 +205,12 @@ virt_daemon_units = [] # * in_file - source init file (required) openrc_init_files = [] +# sysconf_files +# install libvirt daemon sysconf files +# * name - daemon name (required) +# * file - source sysconf file (required) +sysconf_files = [] + # list subdirectories @@ -786,3 +792,11 @@ if conf.has('WITH_LIBVIRTD') endforeach endif endif + +foreach sysconf : sysconf_files + install_data( + sysconf['file'], + install_dir: sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) +endforeach diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 81971c64ed..2202903870 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) if WITH_NETWORK -SYSCONF_FILES += network/virtnetworkd.sysconf - INSTALL_DATA_DIRS += network UUID=$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index f6380e2505..1b2536cfab 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -71,4 +71,9 @@ if conf.has('WITH_NETWORK') 'name': 'virtnetworkd', 'in_file': files('virtnetworkd.init.in'), } + + sysconf_files += { + 'name': 'virtnetworkd', + 'file': files('virtnetworkd.sysconf'), + } endif diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index e6fcbf6c9e..63d2548e11 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -9,8 +9,3 @@ DRIVER_SOURCE_FILES += \ STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) - - -if WITH_NODE_DEVICES -SYSCONF_FILES += node_device/virtnodedevd.sysconf -endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 386d8bc4a4..31e968a6d6 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -64,4 +64,9 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'in_file': files('virtnodedevd.init.in'), } + + sysconf_files += { + 'name': 'virtnodedevd', + 'file': files('virtnodedevd.sysconf'), + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 8fcd63cbbf..4df4756adf 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,6 +11,4 @@ if WITH_NWFILTER nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA = $(NWFILTER_XML_FILES) -SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf - endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index e6667714b5..5e0ded5be0 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -59,4 +59,9 @@ if conf.has('WITH_NWFILTER') 'name': 'virtnwfilterd', 'in_file': files('virtnwfilterd.init.in'), } + + sysconf_files += { + 'name': 'virtnwfilterd', + 'file': files('virtnwfilterd.sysconf'), + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index ec3178c373..6d1e9e7814 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -4,7 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) if WITH_QEMU -SYSCONF_FILES += qemu/virtqemud.sysconf INSTALL_DATA_DIRS += qemu diff --git a/src/qemu/meson.build b/src/qemu/meson.build index f55018f3f5..8f8a8d6f54 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -155,4 +155,9 @@ if conf.has('WITH_QEMU') 'name': 'virtqemud', 'in_file': files('virtqemud.init.in'), } + + sysconf_files += { + 'name': 'virtqemud', + 'file': files('virtqemud.sysconf'), + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 73f7578ee5..14c7a8e414 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -7,11 +7,6 @@ LOGROTATE_FILES_IN += \ remote/libvirtd.logrotate.in \ $(NULL) -SYSCONF_FILES += \ - remote/libvirtd.sysconf \ - remote/virtproxyd.sysconf \ - $(NULL) - if WITH_LIBVIRTD INSTALL_DATA_DIRS += remote diff --git a/src/remote/meson.build b/src/remote/meson.build index f03368bd99..d7473eaeec 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -170,6 +170,11 @@ if conf.has('WITH_REMOTE') 'confd': files('libvirtd.confd'), } + sysconf_files += { + 'name': 'libvirtd', + 'file': files('libvirtd.sysconf'), + } + virt_daemons += { 'name': 'virtproxyd', 'c_args': [ @@ -199,6 +204,11 @@ if conf.has('WITH_REMOTE') 'in_file': files('virtproxyd.init.in'), 'confd': files('virtproxyd.confd'), } + + sysconf_files += { + 'name': 'virtproxyd', + 'file': files('virtproxyd.sysconf'), + } endif endif diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index dd38e6888c..a60a6b507f 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -3,7 +3,3 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) - -if WITH_SECRETS -SYSCONF_FILES += secret/virtsecretd.sysconf -endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index 4b7c99ade5..0c7949aa41 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -41,4 +41,9 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'in_file': files('virtsecretd.init.in'), } + + sysconf_files += { + 'name': 'virtsecretd', + 'file': files('virtsecretd.sysconf'), + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 2357665978..d5438e8a71 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -3,7 +3,3 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) - -if WITH_STORAGE -SYSCONF_FILES += storage/virtstoraged.sysconf -endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index 9940b0a73e..52b7b3b276 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -139,6 +139,11 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'in_file': files('virtstoraged.init.in'), } + + sysconf_files += { + 'name': 'virtstoraged', + 'file': files('virtstoraged.sysconf'), + } endif if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 28bc3c4a58..6197c3172b 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -4,7 +4,3 @@ DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ $(NULL) - -if WITH_VBOX -SYSCONF_FILES += vbox/virtvboxd.sysconf -endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 4f9174152b..ddd53f9991 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -64,4 +64,9 @@ if conf.has('WITH_VBOX') 'name': 'virtvboxd', 'in_file': files('virtvboxd.init.in'), } + + sysconf_files += { + 'name': 'virtvboxd', + 'file': files('virtvboxd.sysconf'), + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 7e7d402a7f..380d1ffb83 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -2,8 +2,3 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) - - -if WITH_VZ -SYSCONF_FILES += vz/virtvzd.sysconf -endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index 3c94fc907c..1f54c1f4d9 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -56,4 +56,9 @@ if conf.has('WITH_VZ') 'name': 'virtvzd', 'in_file': files('virtvzd.init.in'), } + + sysconf_files += { + 'name': 'virtvzd', + 'file': files('virtvzd.sysconf'), + } endif