]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: src: generate openrc init files
authorPavel Hrdina <phrdina@redhat.com>
Tue, 28 Jul 2020 10:11:31 +0000 (12:11 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 3 Aug 2020 07:27:05 +0000 (09:27 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
30 files changed:
src/Makefile.am
src/interface/Makefile.inc.am
src/interface/meson.build
src/libxl/Makefile.inc.am
src/libxl/meson.build
src/locking/Makefile.inc.am
src/locking/meson.build
src/logging/Makefile.inc.am
src/logging/meson.build
src/lxc/Makefile.inc.am
src/lxc/meson.build
src/meson.build
src/network/Makefile.inc.am
src/network/meson.build
src/node_device/Makefile.inc.am
src/node_device/meson.build
src/nwfilter/Makefile.inc.am
src/nwfilter/meson.build
src/qemu/Makefile.inc.am
src/qemu/meson.build
src/remote/Makefile.inc.am
src/remote/meson.build
src/secret/Makefile.inc.am
src/secret/meson.build
src/storage/Makefile.inc.am
src/storage/meson.build
src/vbox/Makefile.inc.am
src/vbox/meson.build
src/vz/Makefile.inc.am
src/vz/meson.build

index ddc6ec84251dcf74f2bf5a1f3133bd045b213008..d199190a4079e3f1b95121644f38ebbd4b366c00 100644 (file)
@@ -35,17 +35,8 @@ tapset_DATA =
 endif WITH_DTRACE_PROBES
 RPC_PROBE_FILES =
 LOGROTATE_FILES_IN =
-OPENRC_INIT_FILES =
-OPENRC_INIT_FILES_IN =
-OPENRC_CONF_FILES =
 SYSCONF_FILES =
 
-COMMON_UNIT_VARS = \
-       -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
@@ -231,25 +222,6 @@ uninstall-sysconfig:
        done
        rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
 
-OPENRC_CONF_DIR = $(sysconfdir)/conf.d
-
-install-openrc-conf:
-       $(MKDIR_P) $(DESTDIR)$(OPENRC_CONF_DIR)
-       for f in $(OPENRC_CONF_FILES:%.confd=%) ; \
-       do \
-               tgt=`basename $$f`; \
-               $(INSTALL_DATA) $(srcdir)/$$f.confd \
-                       $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \
-       done
-
-uninstall-openrc-conf:
-       for f in $(OPENRC_CONF_FILES:%.confd=%) ; \
-       do \
-               tgt=`basename $$f`; \
-               rm -f $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \
-       done
-       rmdir $(DESTDIR)$(OPENRC_CONF_DIR) || :
-
 LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
 
 BUILT_SOURCES += $(LOGROTATE_FILES)
@@ -279,40 +251,6 @@ UNINSTALL_LOCAL += uninstall-logrotate
 endif WITH_LIBVIRTD
 
 
-if WITH_LIBVIRTD
-if LIBVIRT_INIT_SCRIPT_OPENRC
-
-OPENRC_INIT_DIR = $(sysconfdir)/init.d
-
-BUILT_SOURCES += $(OPENRC_INIT_FILES)
-
-install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf
-       $(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR)
-       for f in $(OPENRC_INIT_FILES:%.init=%) ; \
-       do \
-               tgt=`basename $$f`; \
-               $(INSTALL_SCRIPT) $$f.init \
-               $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \
-       done
-
-uninstall-openrc: uninstall-openrc-conf
-       for f in $(OPENRC_INIT_FILES:%.init=%) ; \
-       do \
-               tgt=`basename $$f`; \
-               rm -f $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \
-       done
-       rmdir $(DESTDIR)$(OPENRC_INIT_DIR) || :
-
-INSTALL_DATA_LOCAL += install-openrc
-UNINSTALL_LOCAL += uninstall-openrc
-endif LIBVIRT_INIT_SCRIPT_OPENRC
-
-endif WITH_LIBVIRTD
-
-
-generated-sources: $(BUILT_SOURCES)
-
-
 install-data-local: $(INSTALL_DATA_LOCAL) \
                $(INSTALL_DATA_DIRS:%=install-data-%)
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
index b4bcfb7ecaa95151ac81a80de5d322277cc1309d..f6626c7f491ffe5500998e06cfb09ac42f17a6ee 100644 (file)
@@ -8,14 +8,4 @@ if WITH_INTERFACE
 
 SYSCONF_FILES += interface/virtinterfaced.sysconf
 
-OPENRC_INIT_FILES += \
-       virtinterfaced.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index b4cab22a3073f63f0ed2ab7b7c89dbcb2aab6e77..dbf0599b6418ce91087d2c3913a550c855828104 100644 (file)
@@ -47,4 +47,9 @@ if conf.has('WITH_INTERFACE')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtinterfaced',
+    'in_file': files('virtinterfaced.init.in')
+  }
 endif
index b29ae98269c91659ef7debc285305e40c9b415b6..9a33eb5f06b647fdb0aa98d8c2f789959005a420 100644 (file)
@@ -7,16 +7,6 @@ if WITH_LIBXL
 
 SYSCONF_FILES += libxl/virtxend.sysconf
 
-OPENRC_INIT_FILES += \
-       virtxend.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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 += libxl
 
 install-data-libxl:
index 7f55fc56218d104d5f05b95deb0d85fb5a02771c..be644cab632ee19000b5cedcfdb4cc238a4267c1 100644 (file)
@@ -66,4 +66,9 @@ if conf.has('WITH_LIBXL')
     'deps': 'ConditionPathExists=/proc/xen/capabilities',
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtxend',
+    'in_file': files('virtxend.init.in'),
+  }
 endif
index 8727efdc9a585a0acb2451db3dcf4048d5990c78..8a0ecd8d1f2d9e8314502f3bc753ad7d6062218c 100644 (file)
@@ -3,13 +3,6 @@
 RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
 SYSCONF_FILES += locking/virtlockd.sysconf
 
-OPENRC_INIT_FILES += \
-       virtlockd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       locking/virtlockd.init.in \
-       $(NULL)
-
 INSTALL_DATA_DIRS += locking
 
 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 $@
index d35853e799bd916a697e782c9413e8d8694e4aec..f560c9b44b909378c1c203b4da5ba993327647e7 100644 (file)
@@ -144,6 +144,11 @@ if conf.has('WITH_LIBVIRTD')
     'socket_admin_in': files('virtlockd-admin.socket.in'),
   }
 
+  openrc_init_files += {
+    'name': 'virtlockd',
+    'in_file': files('virtlockd.init.in'),
+  }
+
   if conf.has('WITH_SANLOCK')
     virt_helpers += {
       'name': 'libvirt_sanlock_helper',
index ad07c7b7f77ea147e1b59ae51bbbe8cfdc0a9769..48cae3add151b8a3c7ff9b1e950961cc95b44f95 100644 (file)
@@ -1,13 +1,3 @@
 # vim: filetype=automake
 
 SYSCONF_FILES += logging/virtlogd.sysconf
-
-OPENRC_INIT_FILES += \
-       virtlogd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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 $@
index f0ca0c5417420a5618b6f7162a5af2d966e36624..a689ea5ab88276be62e889e17ca4c1ee5b807b04 100644 (file)
@@ -88,6 +88,11 @@ if conf.has('WITH_LIBVIRTD')
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),
   }
+
+  openrc_init_files += {
+    'name': 'virtlogd',
+    'in_file': files('virtlogd.init.in'),
+  }
 endif
 
 log_inc_dir = include_directories('.')
index 1b3d0a2b4a845c29597381858259b613e9248acc..3cf6f96ea1d6be96f7846ec495a1b2529a05c2fa 100644 (file)
@@ -13,16 +13,6 @@ if WITH_LXC
 
 SYSCONF_FILES += lxc/virtlxcd.sysconf
 
-OPENRC_INIT_FILES += \
-       virtlxcd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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 += $(srcdir)/lxc/lxc_monitor_protocol.x
 endif
index e12c1f6bb122ae9ec2acdacc38167cbd60ab247e..9117562e694e8d9ba39596bbe997407f4937184a 100644 (file)
@@ -149,4 +149,9 @@ if conf.has('WITH_LXC')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtlxcd',
+    'in_file': files('virtlxcd.init.in'),
+  }
 endif
index 88b378566f4ddf6bfc64a3e83edf7c4c20819b75..b6a10ac265f2f23b75a1a530013bdf74d50b8ebd 100644 (file)
@@ -199,6 +199,12 @@ guest_unit_files = []
 #   * conflicts - if the service conflicts with libvirtd (optional, true)
 virt_daemon_units = []
 
+# openrc_init_files
+#   generate libvirt daemon openrc init files
+#   * name - daemon name (required)
+#   * in_file - source init file (required)
+openrc_init_files = []
+
 
 # list subdirectories
 
@@ -744,4 +750,39 @@ if conf.has('WITH_LIBVIRTD')
       endforeach
     endforeach
   endif
+
+  # Generate openrc init files
+  if init_script == 'openrc'
+    foreach init : openrc_init_files
+      init_conf = configuration_data()
+      init_conf.set('sbindir', sbindir)
+      init_conf.set('runstatedir', runstatedir)
+      if conf.has('WITH_FIREWALLD')
+        need_firewalld = 'need firewalld'
+      else
+        need_firewalld = ''
+      endif
+      init_conf.set('NEED_FIREWALLD', need_firewalld)
+
+      init_file = 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
index b84057eeb720409fc28263affa7342d8cb2ae460..81971c64ed4bff612ef985d8fe053b70174d46d3 100644 (file)
@@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 if WITH_NETWORK
 SYSCONF_FILES += network/virtnetworkd.sysconf
 
-OPENRC_INIT_FILES += \
-       virtnetworkd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       network/virtnetworkd.init.in \
-       $(NULL)
-
-virtnetworkd.init: network/virtnetworkd.init.in $(top_builddir)/config.status
-       $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
-
 INSTALL_DATA_DIRS += network
 
 UUID=$(shell uuidgen 2>/dev/null)
index 5d4c8a908cf7aeac18e8ad59b88782ae372f3d87..f6380e250501a21e8317f26149ceeb585ff0c213 100644 (file)
@@ -66,4 +66,9 @@ if conf.has('WITH_NETWORK')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtnetworkd',
+    'in_file': files('virtnetworkd.init.in'),
+  }
 endif
index beff0d6ed04f9185ab048d193f9c5a4f8fa04dcb..e6fcbf6c9e54569157181c7df37ace1a0f64c6da 100644 (file)
@@ -13,15 +13,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 if WITH_NODE_DEVICES
 SYSCONF_FILES += node_device/virtnodedevd.sysconf
-
-OPENRC_INIT_FILES += \
-       virtnodedevd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index ee2280f6ebb3ad47924add40aa135871cf6899b1..386d8bc4a4bd7e20127abdffda8a87c1947e8ba0 100644 (file)
@@ -59,4 +59,9 @@ if conf.has('WITH_NODE_DEVICES')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtnodedevd',
+    'in_file': files('virtnodedevd.init.in'),
+  }
 endif
index 2384f053aeb7541e9d72015432a363e643cd15d1..8fcd63cbbf98755e892a87b145008514333edb11 100644 (file)
@@ -13,14 +13,4 @@ nwfilterxml_DATA = $(NWFILTER_XML_FILES)
 
 SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
 
-OPENRC_INIT_FILES += \
-       virtnwfilterd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index d15506090e21e2512b59ef0ed0e0c32c960ab182..e6667714b530e2fcf00753126b9dd9d696572678 100644 (file)
@@ -54,4 +54,9 @@ if conf.has('WITH_NWFILTER')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtnwfilterd',
+    'in_file': files('virtnwfilterd.init.in'),
+  }
 endif
index 0ea8905ed577eb54d59c4cb801f03d9b058ebff8..ec3178c373ae42dd8de14fcc0da22d27f103c712 100644 (file)
@@ -6,16 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 if WITH_QEMU
 SYSCONF_FILES += qemu/virtqemud.sysconf
 
-OPENRC_INIT_FILES += \
-       virtqemud.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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 += qemu
 
 install-data-qemu:
index 918d4f2cfa09934c9dffd8cd3327fff1f82d09a1..f55018f3f5d99a250ea61036862afe705ac88038 100644 (file)
@@ -150,4 +150,9 @@ if conf.has('WITH_QEMU')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtqemud',
+    'in_file': files('virtqemud.init.in'),
+  }
 endif
index 159bc5e01bed482ebaadb3d021baf831ae445353..73f7578ee5e3e88580ce4db26054acabcf3b6fe8 100644 (file)
@@ -12,19 +12,6 @@ SYSCONF_FILES += \
        remote/virtproxyd.sysconf \
        $(NULL)
 
-OPENRC_INIT_FILES += \
-       libvirtd.init \
-       virtproxyd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       remote/libvirtd.init.in \
-       remote/virtproxyd.init.in \
-       $(NULL)
-OPENRC_CONF_FILES += \
-       remote/libvirtd.confd \
-       remote/virtproxyd.confd \
-       $(NULL)
-
 if WITH_LIBVIRTD
 
 INSTALL_DATA_DIRS += remote
@@ -100,20 +87,3 @@ uninstall-sasl:
 INSTALL_DATA_LOCAL += install-sasl
 UNINSTALL_LOCAL += uninstall-sasl
 endif WITH_SASL
-
-LIBVIRTD_INIT_VARS = \
-       $(COMMON_UNIT_VARS)
-
-if WITH_FIREWALLD
-LIBVIRTD_INIT_VARS += \
-       -e 's|[@]NEED_FIREWALLD[@]|need firewalld|g'
-else ! WITH_FIREWALLD
-LIBVIRTD_INIT_VARS += \
-       -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 $@
index cb048e7f62fc0740cdf0b09d230c898bf65a0449..f03368bd9965b4ccec6c912d390aa4beadcb57ce 100644 (file)
@@ -164,6 +164,12 @@ if conf.has('WITH_REMOTE')
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
     }
 
+    openrc_init_files += {
+      'name': 'libvirtd',
+      'in_file': files('libvirtd.init.in'),
+      'confd': files('libvirtd.confd'),
+    }
+
     virt_daemons += {
       'name': 'virtproxyd',
       'c_args': [
@@ -187,6 +193,12 @@ if conf.has('WITH_REMOTE')
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
       'deps': libvirtd_socket_conflicts,
     }
+
+    openrc_init_files += {
+      'name': 'virtproxyd',
+      'in_file': files('virtproxyd.init.in'),
+      'confd': files('virtproxyd.confd'),
+    }
   endif
 endif
 
index 3aafe7a6a5d5617c77e82387359b890314cbc42b..dd38e6888cd84bf4d753b08ad864feb04ee9cb68 100644 (file)
@@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 if WITH_SECRETS
 SYSCONF_FILES += secret/virtsecretd.sysconf
-
-OPENRC_INIT_FILES += \
-       virtsecretd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index fc1984e4806f3201c2bf47a889c577e4c57192bf..4b7c99ade5d3a1086338339525be907037381dcb 100644 (file)
@@ -36,4 +36,9 @@ if conf.has('WITH_SECRETS')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtsecretd',
+    'in_file': files('virtsecretd.init.in'),
+  }
 endif
index 3b4a13032aa9d947b64dcf70d85a31bace935b74..23576659785f4cb1723c3b713e872e2b463c43d1 100644 (file)
@@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 if WITH_STORAGE
 SYSCONF_FILES += storage/virtstoraged.sysconf
-
-OPENRC_INIT_FILES += \
-       virtstoraged.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       storage/virtstoraged.init.in \
-       $(NULL)
-
-virtstoraged.init: storage/virtstoraged.init.in $(top_builddir)/config.status
-       $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
-
 endif WITH_STORAGE
index 1f42206c9803081348935755cfb33d9c0c0b764b..9940b0a73e4c8531a8b94f34fac6a14c0ed332d8 100644 (file)
@@ -134,6 +134,11 @@ if conf.has('WITH_STORAGE')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtstoraged',
+    'in_file': files('virtstoraged.init.in'),
+  }
 endif
 
 if conf.has('WITH_STORAGE_DISK')
index 4968777858cdadb8d5cb7a3ba81cb27a83856dc4..28bc3c4a585a050944449e9d3a071bb78e163d3c 100644 (file)
@@ -7,15 +7,4 @@ DRIVER_SOURCE_FILES += \
 
 if WITH_VBOX
 SYSCONF_FILES += vbox/virtvboxd.sysconf
-
-OPENRC_INIT_FILES += \
-       virtvboxd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index f763c2b4cea29a392366a8d7c0fa8714754719ad..4f9174152b26e618bbb1b02d27ce03598cce5979 100644 (file)
@@ -59,4 +59,9 @@ if conf.has('WITH_VBOX')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtvboxd',
+    'in_file': files('virtvboxd.init.in'),
+  }
 endif
index 5889d0170a403f942c5be564faa72b6d6ee3944d..7e7d402a7f0ab3149e529b1a37789f9904945f74 100644 (file)
@@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
 
 if WITH_VZ
 SYSCONF_FILES += vz/virtvzd.sysconf
-
-OPENRC_INIT_FILES += \
-       virtvzd.init \
-       $(NULL)
-OPENRC_INIT_FILES_IN += \
-       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
index a6521748aea1061914d8986d85553553005eabba..3c94fc907cbdaed4753d8d6f2dbc2a6a5bd8fc87 100644 (file)
@@ -51,4 +51,9 @@ if conf.has('WITH_VZ')
     'sockets': [ 'main', 'ro', 'admin' ],
     'conflicts': true,
   }
+
+  openrc_init_files += {
+    'name': 'virtvzd',
+    'in_file': files('virtvzd.init.in'),
+  }
 endif