From nobody Mon Feb 9 02:15:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894430; cv=none; d=zohomail.com; s=zohoarc; b=D1HCqgd5nuWpyYmWtcE3XMjFmutKhgCFleu2Xf9uVsJ5uweSQosmr43DpM+81rrdhkXEjFCCRdbcvUoGM7ersyKtlj6Fw/5Ck3z3gGoertjTnC4vIdzuIbO0vbCZcajuMg651gQc3RlgQ4YqG3p3Zw2vI8QxdJMR22CVhcKOJH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894430; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i+1iRGOhnD8F4CTKWnDxSfLXuBhcioWo8tXG+6kZBIY=; b=WRpCJrSzTH+B6KoHGjHRXvAGHwqejNcOVNFTBfl5Phah4weawl1ChkCaie9W4n7VSJLJ9N814MZwgIId6/eLLNMYeeAC2+xgiHeXx1ieeAgzrScFwNrp97tLPEoO3xvF9DcX9snP2DdCr8BWDLpUa6424a/SW2/plNUGyxqvpoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894430741319.1194585836066; Thu, 16 Jul 2020 03:13:50 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-in-Fn_9FOUy2ZeJPVir6GQ-1; Thu, 16 Jul 2020 06:13:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 161EE805723; Thu, 16 Jul 2020 10:13:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECEA772AE6; Thu, 16 Jul 2020 10:13:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BB51218045D8; Thu, 16 Jul 2020 10:13:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA5jZI018663 for ; Thu, 16 Jul 2020 06:05:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 65D0E2DE69; Thu, 16 Jul 2020 10:05:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D457E2B6DB for ; Thu, 16 Jul 2020 10:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894429; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i+1iRGOhnD8F4CTKWnDxSfLXuBhcioWo8tXG+6kZBIY=; b=FKqfy5sKPZegBAYUvEbk6a4uL957DUAUyM95ZwNO6A1sU1AzUIX/vrndhRMPoUcbEGn27s Qv81+KmXEEyTPyPDvoPv8ewb3V3Barv/nQXJ49p+g8HFz7gqM81w+lAVtN0haQH8w/ovsr frE5q451gvke4OyRsKiHRyMN6P5IXb8= X-MC-Unique: in-Fn_9FOUy2ZeJPVir6GQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 227/351] meson: src: generate openrc init files Date: Thu, 16 Jul 2020 11:57:43 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 57 --------------------------------- src/interface/Makefile.inc.am | 10 ------ src/interface/meson.build | 5 +++ src/libxl/Makefile.inc.am | 10 ------ src/libxl/meson.build | 5 +++ src/locking/Makefile.inc.am | 11 ------- src/locking/meson.build | 5 +++ src/logging/Makefile.inc.am | 10 ------ src/logging/meson.build | 5 +++ src/lxc/Makefile.inc.am | 10 ------ src/lxc/meson.build | 5 +++ src/meson.build | 41 ++++++++++++++++++++++++ src/network/Makefile.inc.am | 10 ------ src/network/meson.build | 5 +++ src/node_device/Makefile.inc.am | 11 ------- src/node_device/meson.build | 5 +++ src/nwfilter/Makefile.inc.am | 10 ------ src/nwfilter/meson.build | 5 +++ src/qemu/Makefile.inc.am | 10 ------ src/qemu/meson.build | 5 +++ src/remote/Makefile.inc.am | 30 ----------------- src/remote/meson.build | 12 +++++++ src/secret/Makefile.inc.am | 11 ------- src/secret/meson.build | 5 +++ src/storage/Makefile.inc.am | 11 ------- src/storage/meson.build | 5 +++ src/vbox/Makefile.inc.am | 11 ------- src/vbox/meson.build | 5 +++ src/vz/Makefile.inc.am | 11 ------- src/vz/meson.build | 5 +++ 30 files changed, 118 insertions(+), 223 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bd27e5acc29..0b40c23f980 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,17 +34,8 @@ tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D -OPENRC_INIT_FILES =3D -OPENRC_INIT_FILES_IN =3D -OPENRC_CONF_FILES =3D SYSCONF_FILES =3D =20 -COMMON_UNIT_VARS =3D \ - -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - $(NULL) - include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am @@ -226,25 +217,6 @@ uninstall-sysconfig: done rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : =20 -OPENRC_CONF_DIR =3D $(sysconfdir)/conf.d - -install-openrc-conf: - $(MKDIR_P) $(DESTDIR)$(OPENRC_CONF_DIR) - for f in $(OPENRC_CONF_FILES:%.confd=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - $(INSTALL_DATA) $(srcdir)/$$f.confd \ - $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \ - done - -uninstall-openrc-conf: - for f in $(OPENRC_CONF_FILES:%.confd=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - rm -f $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \ - done - rmdir $(DESTDIR)$(OPENRC_CONF_DIR) || : - LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) =20 %.logrotate: remote/%.logrotate.in @@ -272,35 +244,6 @@ UNINSTALL_LOCAL +=3D uninstall-logrotate endif WITH_LIBVIRTD =20 =20 -if WITH_LIBVIRTD -if LIBVIRT_INIT_SCRIPT_OPENRC - -OPENRC_INIT_DIR =3D $(sysconfdir)/init.d - -install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf - $(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR) - for f in $(OPENRC_INIT_FILES:%.init=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - $(INSTALL_SCRIPT) $$f.init \ - $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \ - done - -uninstall-openrc: uninstall-openrc-conf - for f in $(OPENRC_INIT_FILES:%.init=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - rm -f $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \ - done - rmdir $(DESTDIR)$(OPENRC_INIT_DIR) || : - -INSTALL_DATA_LOCAL +=3D install-openrc -UNINSTALL_LOCAL +=3D uninstall-openrc -endif LIBVIRT_INIT_SCRIPT_OPENRC - -endif WITH_LIBVIRTD - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index b4bcfb7ecaa..f6626c7f491 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -8,14 +8,4 @@ if WITH_INTERFACE =20 SYSCONF_FILES +=3D interface/virtinterfaced.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtinterfaced.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - interface/virtinterfaced.init.in \ - $(NULL) - -virtinterfaced.init: interface/virtinterfaced.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index a94b1164aa1..a6b3e888358 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -48,4 +48,9 @@ if conf.has('WITH_INTERFACE') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtinterfaced', + 'in_file': files('virtinterfaced.init.in') + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index b29ae98269c..9a33eb5f06b 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -7,16 +7,6 @@ if WITH_LIBXL =20 SYSCONF_FILES +=3D libxl/virtxend.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtxend.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - libxl/virtxend.init.in \ - $(NULL) - -virtxend.init: libxl/virtxend.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 4a872198702..5f858dc32fc 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -67,4 +67,9 @@ if conf.has('WITH_LIBXL') 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtxend', + 'in_file': files('virtxend.init.in'), + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 8727efdc9a5..8a0ecd8d1f2 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -3,13 +3,6 @@ RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtlockd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - locking/virtlockd.init.in \ - $(NULL) - INSTALL_DATA_DIRS +=3D locking =20 install-data-locking: @@ -33,7 +26,3 @@ endif WITH_LIBVIRTD install-data-locking \ uninstall-data-locking \ $(NULL) - - -virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index d35853e799b..f560c9b44b9 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -144,6 +144,11 @@ if conf.has('WITH_LIBVIRTD') 'socket_admin_in': files('virtlockd-admin.socket.in'), } =20 + openrc_init_files +=3D { + 'name': 'virtlockd', + 'in_file': files('virtlockd.init.in'), + } + if conf.has('WITH_SANLOCK') virt_helpers +=3D { 'name': 'libvirt_sanlock_helper', diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index ad07c7b7f77..48cae3add15 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -1,13 +1,3 @@ # vim: filetype=3Dautomake =20 SYSCONF_FILES +=3D logging/virtlogd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtlogd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - logging/virtlogd.init.in \ - $(NULL) - -virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/logging/meson.build b/src/logging/meson.build index 9cfd60019ea..40327241e3c 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -87,4 +87,9 @@ if conf.has('WITH_LIBVIRTD') 'socket_in': files('virtlogd.socket.in'), 'socket_admin_in': files('virtlogd-admin.socket.in'), } + + openrc_init_files +=3D { + 'name': 'virtlogd', + 'in_file': files('virtlogd.init.in'), + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 1b3d0a2b4a8..3cf6f96ea1d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -13,16 +13,6 @@ if WITH_LXC =20 SYSCONF_FILES +=3D lxc/virtlxcd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtlxcd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - lxc/virtlxcd.init.in \ - $(NULL) - -virtlxcd.init: lxc/virtlxcd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index c539149a8c9..6135f61d4ab 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -150,4 +150,9 @@ if conf.has('WITH_LXC') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtlxcd', + 'in_file': files('virtlxcd.init.in'), + } endif diff --git a/src/meson.build b/src/meson.build index b22c950c6d4..602e8176d99 100644 --- a/src/meson.build +++ b/src/meson.build @@ -191,6 +191,12 @@ guest_unit_files =3D [] # * conflicts - if the service conflicts with libvirtd (optional, true) virt_daemon_units =3D [] =20 +# openrc_init_files +# generate libvirt daemon openrc init files +# * name - daemon name (required) +# * in_file - source init file (required) +openrc_init_files =3D [] + =20 # list subdirectories =20 @@ -718,4 +724,39 @@ if conf.has('WITH_LIBVIRTD') endforeach endforeach endif + + # Generate openrc init files + if init_script =3D=3D 'openrc' + foreach init : openrc_init_files + init_conf =3D configuration_data() + init_conf.set('sbindir', sbindir) + init_conf.set('runstatedir', runstatedir) + if conf.has('WITH_FIREWALLD') + need_firewalld =3D 'need firewalld' + else + need_firewalld =3D '' + endif + init_conf.set('NEED_FIREWALLD', need_firewalld) + + init_file =3D configure_file( + input: init['in_file'], + output: '@0@.init'.format(init['name']), + configuration: init_conf, + ) + + install_data( + init_file, + install_dir: sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], + install_dir: sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif + endforeach + endif endif diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index b84057eeb72..81971c64ed4 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_NETWORK SYSCONF_FILES +=3D network/virtnetworkd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtnetworkd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - network/virtnetworkd.init.in \ - $(NULL) - -virtnetworkd.init: network/virtnetworkd.init.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index 0c643900c15..c27578d66b4 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -67,4 +67,9 @@ if conf.has('WITH_NETWORK') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnetworkd', + 'in_file': files('virtnetworkd.init.in'), + } endif diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index beff0d6ed04..e6fcbf6c9e5 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -13,15 +13,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_NODE_DEVICES SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtnodedevd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - node_device/virtnodedevd.init.in \ - $(NULL) - -virtnodedevd.init: node_device/virtnodedevd.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 875e4ec775f..d73867148ea 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -60,4 +60,9 @@ if conf.has('WITH_NODE_DEVICES') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnodedevd', + 'in_file': files('virtnodedevd.init.in'), + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 2384f053aeb..8fcd63cbbf9 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -13,14 +13,4 @@ nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtnwfilterd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - nwfilter/virtnwfilterd.init.in \ - $(NULL) - -virtnwfilterd.init: nwfilter/virtnwfilterd.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 50ee78933e2..744600a73d1 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -55,4 +55,9 @@ if conf.has('WITH_NWFILTER') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnwfilterd', + 'in_file': files('virtnwfilterd.init.in'), + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 0ea8905ed57..ec3178c373a 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -6,16 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (QEMU_DRIVER_SOURCES)) if WITH_QEMU SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtqemud.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - qemu/virtqemud.init.in \ - $(NULL) - -virtqemud.init: qemu/virtqemud.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D qemu =20 install-data-qemu: diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 479c530ece8..09b72335741 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -147,4 +147,9 @@ if conf.has('WITH_QEMU') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtqemud', + 'in_file': files('virtqemud.init.in'), + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 159bc5e01be..73f7578ee5e 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -12,19 +12,6 @@ SYSCONF_FILES +=3D \ remote/virtproxyd.sysconf \ $(NULL) =20 -OPENRC_INIT_FILES +=3D \ - libvirtd.init \ - virtproxyd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - remote/libvirtd.init.in \ - remote/virtproxyd.init.in \ - $(NULL) -OPENRC_CONF_FILES +=3D \ - remote/libvirtd.confd \ - remote/virtproxyd.confd \ - $(NULL) - if WITH_LIBVIRTD =20 INSTALL_DATA_DIRS +=3D remote @@ -100,20 +87,3 @@ uninstall-sasl: INSTALL_DATA_LOCAL +=3D install-sasl UNINSTALL_LOCAL +=3D uninstall-sasl endif WITH_SASL - -LIBVIRTD_INIT_VARS =3D \ - $(COMMON_UNIT_VARS) - -if WITH_FIREWALLD -LIBVIRTD_INIT_VARS +=3D \ - -e 's|[@]NEED_FIREWALLD[@]|need firewalld|g' -else ! WITH_FIREWALLD -LIBVIRTD_INIT_VARS +=3D \ - -e 's|[@]NEED_FIREWALLD[@]||g' -endif ! WITH_FIREWALLD - -libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -virtproxyd.init: remote/virtproxyd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/remote/meson.build b/src/remote/meson.build index c0bc6f14b93..0310ad232aa 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -146,6 +146,12 @@ if conf.has('WITH_REMOTE') 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], } =20 + openrc_init_files +=3D { + 'name': 'libvirtd', + 'in_file': files('libvirtd.init.in'), + 'confd': files('libvirtd.confd'), + } + virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -170,6 +176,12 @@ if conf.has('WITH_REMOTE') 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], 'deps': libvirtd_socket_conflicts, } + + openrc_init_files +=3D { + 'name': 'virtproxyd', + 'in_file': files('virtproxyd.init.in'), + 'confd': files('virtproxyd.confd'), + } endif endif =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 3aafe7a6a5d..dd38e6888cd 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_SECRETS SYSCONF_FILES +=3D secret/virtsecretd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtsecretd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - secret/virtsecretd.init.in \ - $(NULL) - -virtsecretd.init: secret/virtsecretd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index a6b919dfabb..3b3f999f758 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -37,4 +37,9 @@ if conf.has('WITH_SECRETS') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtsecretd', + 'in_file': files('virtsecretd.init.in'), + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 3b4a13032aa..23576659785 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_STORAGE SYSCONF_FILES +=3D storage/virtstoraged.sysconf - -OPENRC_INIT_FILES +=3D \ - virtstoraged.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - storage/virtstoraged.init.in \ - $(NULL) - -virtstoraged.init: storage/virtstoraged.init.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index acc9600ba4b..7a1ed9f4b81 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -135,6 +135,11 @@ if conf.has('WITH_STORAGE') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtstoraged', + 'in_file': files('virtstoraged.init.in'), + } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 4968777858c..28bc3c4a585 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -7,15 +7,4 @@ DRIVER_SOURCE_FILES +=3D \ =20 if WITH_VBOX SYSCONF_FILES +=3D vbox/virtvboxd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtvboxd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - vbox/virtvboxd.init.in \ - $(NULL) - -virtvboxd.init: vbox/virtvboxd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 1fb88513ba0..f1b8012777f 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -60,4 +60,9 @@ if conf.has('WITH_VBOX') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtvboxd', + 'in_file': files('virtvboxd.init.in'), + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 5889d0170a4..7e7d402a7f0 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (VZ_DRIVER_SOURCES)) =20 if WITH_VZ SYSCONF_FILES +=3D vz/virtvzd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtvzd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - vz/virtvzd.init.in \ - $(NULL) - -virtvzd.init: vz/virtvzd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index dcf8f5037fd..fde1e937f35 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -52,4 +52,9 @@ if conf.has('WITH_VZ') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtvzd', + 'in_file': files('virtvzd.init.in'), + } endif --=20 2.26.2