Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/Makefile.am | 5 ---
src/bhyve/Makefile.inc.am | 30 -------------
src/bhyve/meson.build | 5 +++
src/interface/Makefile.inc.am | 27 ------------
src/interface/meson.build | 5 +++
src/libxl/Makefile.inc.am | 27 ------------
src/libxl/meson.build | 5 +++
src/lxc/Makefile.inc.am | 27 ------------
src/lxc/meson.build | 5 +++
src/network/Makefile.inc.am | 27 ------------
src/network/meson.build | 5 +++
src/node_device/Makefile.inc.am | 28 ------------
src/node_device/meson.build | 5 +++
src/nwfilter/Makefile.inc.am | 28 ------------
src/nwfilter/meson.build | 5 +++
src/qemu/Makefile.inc.am | 27 ------------
src/qemu/meson.build | 5 +++
src/remote/Makefile.inc.am | 77 ---------------------------------
src/remote/meson.build | 12 +++++
src/secret/Makefile.inc.am | 27 ------------
src/secret/meson.build | 5 +++
src/storage/Makefile.inc.am | 28 ------------
src/storage/meson.build | 5 +++
src/vbox/Makefile.inc.am | 27 ------------
src/vbox/meson.build | 5 +++
src/vz/Makefile.inc.am | 27 ------------
src/vz/meson.build | 5 +++
27 files changed, 72 insertions(+), 412 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9693a2e1aea..82e7212b186 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@
# here. List them against the individual XXX_la_CFLAGS targets
# that actually use them.
-nodist_conf_DATA =
DRIVER_SOURCE_FILES =
STATEFUL_DRIVER_SOURCE_FILES =
INSTALL_DATA_DIRS =
@@ -30,7 +29,6 @@ SYM_FILES =
USED_SYM_FILES =
augeas_DATA =
augeastest_DATA =
-conf_DATA =
if WITH_DTRACE_PROBES
tapset_DATA =
endif WITH_DTRACE_PROBES
@@ -195,9 +193,6 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA)
fi
.PHONY: check-augeas
-AUG_GENTEST_SCRIPT = $(top_srcdir)/scripts/augeas-gentest.py
-AUG_GENTEST = $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT)
-
if WITH_DTRACE_PROBES
tapset_DATA += libvirt_functions.stp
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index e09c503c384..65021d785a2 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -2,33 +2,3 @@
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
-
-if WITH_BHYVE
-nodist_conf_DATA += bhyve/virtbhyved.conf
-augeas_DATA += bhyve/virtbhyved.aug
-augeastest_DATA += bhyve/test_virtbhyved.aug
-
-bhyve/virtbhyved.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
- $< > $@
-
-bhyve/virtbhyved.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
- $< > $@
-
-bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
- bhyve/virtbhyved.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
- > $@ || rm -f $@
-
-endif WITH_BHYVE
diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index 74caddf030e..fd1f6bbad88 100644
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -51,4 +51,9 @@ if conf.has('WITH_BHYVE')
'aug': files('test_libvirtd_bhyve.aug.in'),
'conf': files('bhyve.conf'),
}
+
+ virt_daemon_confs += {
+ 'name': 'virtbhyved',
+ 'name_uc': 'Virtbhyved',
+ }
endif
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 7d1d8ed2c4c..a189105dcac 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -6,10 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_INTERFACE
-nodist_conf_DATA += interface/virtinterfaced.conf
-augeas_DATA += interface/virtinterfaced.aug
-augeastest_DATA += interface/test_virtinterfaced.aug
-
SYSCONF_FILES += interface/virtinterfaced.sysconf
SYSTEMD_UNIT_FILES += \
@@ -48,27 +44,4 @@ virtinterface%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
-interface/virtinterfaced.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
- $< > $@
-
-interface/virtinterfaced.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
- $< > $@
-
-interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \
- interface/virtinterfaced.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
- > $@ || rm -f $@
-
endif WITH_INTERFACE
diff --git a/src/interface/meson.build b/src/interface/meson.build
index dbf1d7ff606..fa9c674c084 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -34,4 +34,9 @@ if conf.has('WITH_INTERFACE')
'-DMODULE_NAME="interface"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtinterfaced',
+ 'name_uc': 'Virtinterfaced',
+ }
endif
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 9af04c4914a..57271db1be8 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
if WITH_LIBXL
-nodist_conf_DATA += libxl/virtxend.conf
-augeas_DATA += libxl/virtxend.aug
-augeastest_DATA += libxl/test_virtxend.aug
-
SYSCONF_FILES += libxl/virtxend.sysconf
SYSTEMD_UNIT_FILES += \
@@ -48,29 +44,6 @@ virtxend.service: libxl/virtxend.service.in $(top_builddir)/config.status
virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@
-libxl/virtxend.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtxend/' \
- $< > $@
-
-libxl/virtxend.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtxend/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
- $< > $@
-
-libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
- libxl/virtxend.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtxend/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
- > $@ || rm -f $@
-
INSTALL_DATA_DIRS += libxl
install-data-libxl:
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 92916831120..2fc72d92ac2 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -52,4 +52,9 @@ if conf.has('WITH_LIBXL')
'aug': files('test_libvirtd_libxl.aug.in'),
'conf': files('libxl.conf'),
}
+
+ virt_daemon_confs += {
+ 'name': 'virtxend',
+ 'name_uc': 'Virtxend',
+ }
endif
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index bee6c99b025..2692163226c 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -11,10 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_LXC
-nodist_conf_DATA += lxc/virtlxcd.conf
-augeas_DATA += lxc/virtlxcd.aug
-augeastest_DATA += lxc/test_virtlxcd.aug
-
SYSCONF_FILES += lxc/virtlxcd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -50,29 +46,6 @@ virtlxcd.service: lxc/virtlxcd.service.in $(top_builddir)/config.status
virtlxc%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@
-lxc/virtlxcd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
- $< > $@
-
-lxc/virtlxcd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
- $< > $@
-
-lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \
- lxc/virtlxcd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
- > $@ || rm -f $@
-
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 825c280bd10..650eaef1d81 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -136,4 +136,9 @@ if conf.has('WITH_LXC')
'aug': files('test_libvirtd_lxc.aug.in'),
'conf': files('lxc.conf'),
}
+
+ virt_daemon_confs += {
+ 'name': 'virtlxcd',
+ 'name_uc': 'Virtlxcd',
+ }
endif
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index fe93adc0194..ee5413e85e1 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
if WITH_NETWORK
-nodist_conf_DATA += network/virtnetworkd.conf
-augeas_DATA += network/virtnetworkd.aug
-augeastest_DATA += network/test_virtnetworkd.aug
-
SYSCONF_FILES += network/virtnetworkd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -46,29 +42,6 @@ virtnetwork%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
-network/virtnetworkd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
- $< > $@
-
-network/virtnetworkd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
- $< > $@
-
-network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \
- network/virtnetworkd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
- > $@ || rm -f $@
-
INSTALL_DATA_DIRS += network
UUID=$(shell uuidgen 2>/dev/null)
diff --git a/src/network/meson.build b/src/network/meson.build
index 9b59e442c9d..1e31f8d30cb 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -46,6 +46,11 @@ if conf.has('WITH_NETWORK')
],
}
+ virt_daemon_confs += {
+ 'name': 'virtnetworkd',
+ 'name_uc': 'Virtnetworkd',
+ }
+
virt_helpers += {
'name': 'libvirt_leaseshelper',
'sources': [
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 731d513c980..79491aee577 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -12,10 +12,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_NODE_DEVICES
-nodist_conf_DATA += node_device/virtnodedevd.conf
-augeas_DATA += node_device/virtnodedevd.aug
-augeastest_DATA += node_device/test_virtnodedevd.aug
-
SYSCONF_FILES += node_device/virtnodedevd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -53,28 +49,4 @@ virtnodedevd.service: node_device/virtnodedevd.service.in \
virtnodedev%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
-
-node_device/virtnodedevd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
- $< > $@
-
-node_device/virtnodedevd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
- $< > $@
-
-node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \
- node_device/virtnodedevd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
- > $@ || rm -f $@
-
endif WITH_NODE_DEVICES
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index f85320cf85a..e81fe281359 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -46,4 +46,9 @@ if conf.has('WITH_NODE_DEVICES')
'-DMODULE_NAME="nodedev"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtnodedevd',
+ 'name_uc': 'Virtnodedevd',
+ }
endif
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index eb5cade5b95..2c0d29454bb 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -11,10 +11,6 @@ if WITH_NWFILTER
nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter
nwfilterxml_DATA = $(NWFILTER_XML_FILES)
-nodist_conf_DATA += nwfilter/virtnwfilterd.conf
-augeas_DATA += nwfilter/virtnwfilterd.aug
-augeastest_DATA += nwfilter/test_virtnwfilterd.aug
-
SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -52,28 +48,4 @@ virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \
virtnwfilter%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
-
-nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
- $< > $@
-
-nwfilter/virtnwfilterd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
- $< > $@
-
-nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \
- nwfilter/virtnwfilterd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
- > $@ || rm -f $@
-
endif WITH_NWFILTER
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index b8f94c726c1..0c8641735c8 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -41,4 +41,9 @@ if conf.has('WITH_NWFILTER')
'-DMODULE_NAME="nwfilter"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtnwfilterd',
+ 'name_uc': 'Virtnwfilterd',
+ }
endif
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index ff8a3dcbdc6..46a7d1e9be2 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -4,10 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
if WITH_QEMU
-nodist_conf_DATA += qemu/virtqemud.conf
-augeas_DATA += qemu/virtqemud.aug
-augeastest_DATA += qemu/test_virtqemud.aug
-
SYSCONF_FILES += qemu/virtqemud.sysconf
SYSTEMD_UNIT_FILES += \
@@ -43,29 +39,6 @@ virtqemud.service: qemu/virtqemud.service.in $(top_builddir)/config.status
virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
-qemu/virtqemud.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtqemud/' \
- $< > $@
-
-qemu/virtqemud.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtqemud/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
- $< > $@
-
-qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
- qemu/virtqemud.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtqemud/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
- > $@ || rm -f $@
-
INSTALL_DATA_DIRS += qemu
install-data-qemu:
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 4d5cfec7eaa..35af65cf5f5 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -133,4 +133,9 @@ if conf.has('WITH_QEMU')
],
'install_dir': bindir,
}
+
+ virt_daemon_confs += {
+ 'name': 'virtqemud',
+ 'name_uc': 'Virtqemud',
+ }
endif
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 2007bdf8654..dfea32ff21e 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -62,39 +62,6 @@ OPENRC_CONF_FILES += \
if WITH_LIBVIRTD
-augeas_DATA += \
- remote/libvirtd.aug \
- remote/virtproxyd.aug \
- $(NULL)
-
-augeastest_DATA += \
- remote/test_libvirtd.aug \
- remote/test_virtproxyd.aug \
- $(NULL)
-
-nodist_conf_DATA += \
- remote/libvirtd.conf \
- remote/virtproxyd.conf \
- $(NULL)
-
-remote/libvirtd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's|[@]runstatedir[@]|@runstatedir@|' \
- -e 's|[@]DAEMON_NAME[@]|libvirtd|' \
- $< > $@
-
-remote/virtproxyd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)sed \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's|[@]runstatedir[@]|@runstatedir@|' \
- -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
- $< > $@
-
INSTALL_DATA_DIRS += remote
install-data-remote:
@@ -103,50 +70,6 @@ install-data-remote:
uninstall-data-remote:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
-remote/libvirtd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's|[@]DAEMON_NAME[@]|libvirtd|' \
- -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
- $< > $@
-
-remote/virtproxyd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
- $< > $@
-
-remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
- remote/libvirtd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's|[@]runstatedir[@]|@runstatedir@|' \
- -e 's|[@]DAEMON_NAME[@]|libvirtd|' \
- -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
- > $@ || rm -f $@
-
-remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \
- remote/virtproxyd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/d' \
- -e '/[@]END[@]/d' \
- -e 's|[@]sysconfdir[@]|@sysconfdir@|' \
- -e 's|[@]runstatedir[@]|@runstatedir@|' \
- -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
- > $@ || rm -f $@
-
if WITH_SYSCTL
# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 6635bcd4cff..20ccd14b458 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -120,6 +120,12 @@ if conf.has('WITH_REMOTE')
],
}
+ virt_daemon_confs += {
+ 'name': 'libvirtd',
+ 'name_uc': 'Libvirtd',
+ 'with_ip': true,
+ }
+
virt_daemons += {
'name': 'virtproxyd',
'c_args': [
@@ -129,6 +135,12 @@ if conf.has('WITH_REMOTE')
'-DVIRTPROXYD',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtproxyd',
+ 'name_uc': 'Virtproxyd',
+ 'with_ip': true,
+ }
endif
endif
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 7a03f6728ee..648648c260c 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
if WITH_SECRETS
-nodist_conf_DATA += secret/virtsecretd.conf
-augeas_DATA += secret/virtsecretd.aug
-augeastest_DATA += secret/test_virtsecretd.aug
-
SYSCONF_FILES += secret/virtsecretd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -46,27 +42,4 @@ virtsecret%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
-secret/virtsecretd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
- $< > $@
-
-secret/virtsecretd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
- $< > $@
-
-secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \
- secret/virtsecretd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
- > $@ || rm -f $@
-
endif WITH_SECRETS
diff --git a/src/secret/meson.build b/src/secret/meson.build
index 43f1d7342d5..7b9e253d4a4 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -23,4 +23,9 @@ if conf.has('WITH_SECRETS')
'-DMODULE_NAME="secret"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtsecretd',
+ 'name_uc': 'Virtsecretd',
+ }
endif
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index ee4377d94ff..1ac4da02164 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
if WITH_STORAGE
-nodist_conf_DATA += storage/virtstoraged.conf
-augeas_DATA += storage/virtstoraged.aug
-augeastest_DATA += storage/test_virtstoraged.aug
-
SYSCONF_FILES += storage/virtstoraged.sysconf
SYSTEMD_UNIT_FILES += \
@@ -46,28 +42,4 @@ virtstorage%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
-storage/virtstoraged.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
- $< > $@
-
-storage/virtstoraged.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
- $< > $@
-
-storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
- storage/virtstoraged.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
- > $@ || rm -f $@
-
-
endif WITH_STORAGE
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 1996cd4c11c..b23b5823caa 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -121,6 +121,11 @@ if conf.has('WITH_STORAGE')
'-DMODULE_NAME="storage"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtstoraged',
+ 'name_uc': 'Virtstoraged',
+ }
endif
if conf.has('WITH_STORAGE_DISK')
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index fc71301e595..62c7dc98a0c 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -6,10 +6,6 @@ DRIVER_SOURCE_FILES += \
$(NULL)
if WITH_VBOX
-nodist_conf_DATA += vbox/virtvboxd.conf
-augeas_DATA += vbox/virtvboxd.aug
-augeastest_DATA += vbox/test_virtvboxd.aug
-
SYSCONF_FILES += vbox/virtvboxd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -45,27 +41,4 @@ virtvboxd.service: vbox/virtvboxd.service.in $(top_builddir)/config.status
virtvbox%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@
-vbox/virtvboxd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
- $< > $@
-
-vbox/virtvboxd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
- $< > $@
-
-vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \
- vbox/virtvboxd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
- > $@ || rm -f $@
-
endif WITH_VBOX
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index 0619834a9c8..2c28855e420 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -46,4 +46,9 @@ if conf.has('WITH_VBOX')
'-DMODULE_NAME="vbox"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtvboxd',
+ 'name_uc': 'Virtvboxd',
+ }
endif
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index 18bb0c40c46..ffc684d76de 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
if WITH_VZ
-nodist_conf_DATA += vz/virtvzd.conf
-augeas_DATA += vz/virtvzd.aug
-augeastest_DATA += vz/test_virtvzd.aug
-
SYSCONF_FILES += vz/virtvzd.sysconf
SYSTEMD_UNIT_FILES += \
@@ -44,27 +40,4 @@ virtvzd.service: vz/virtvzd.service.in $(top_builddir)/config.status
virtvz%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@
-vz/virtvzd.conf: remote/libvirtd.conf.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvzd/' \
- $< > $@
-
-vz/virtvzd.aug: remote/libvirtd.aug.in
- $(AM_V_GEN)$(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvzd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
- $< > $@
-
-vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \
- vz/virtvzd.conf $(AUG_GENTEST_SCRIPT)
- $(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \
- $(srcdir)/remote/test_libvirtd.aug.in | \
- $(SED) \
- -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
- -e 's/[@]DAEMON_NAME[@]/virtvzd/' \
- -e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
- > $@ || rm -f $@
-
endif WITH_VZ
diff --git a/src/vz/meson.build b/src/vz/meson.build
index 07ad8fc75ae..ff901179cdd 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -38,4 +38,9 @@ if conf.has('WITH_VZ')
'-DMODULE_NAME="vz"',
],
}
+
+ virt_daemon_confs += {
+ 'name': 'virtvzd',
+ 'name_uc': 'Virtvzd',
+ }
endif
--
2.26.2
