This commit changes the service file from static configuration to an
autogenerated file, produced during the build. This will be relevant in a
future commit.
Signed-off-by: Aaron Conole <acon...@redhat.com>
---
rhel/.gitignore | 1 +
rhel/automake.mk | 5 +++++
...witchd.service => usr_lib_systemd_system_ovs-vswitchd.service.in} | 0
3 files changed, 6 insertions(+)
rename rhel/{usr_lib_systemd_system_ovs-vswitchd.service =>
usr_lib_systemd_system_ovs-vswitchd.service.in} (100%)
diff --git a/rhel/.gitignore b/rhel/.gitignore
index 164bb66..e584a1e 100644
--- a/rhel/.gitignore
+++ b/rhel/.gitignore
@@ -4,3 +4,4 @@ openvswitch-kmod-rhel6.spec
openvswitch-kmod-fedora.spec
openvswitch.spec
openvswitch-fedora.spec
+usr_lib_systemd_system_ovs-vswitchd.service
diff --git a/rhel/automake.mk b/rhel/automake.mk
index 2d9443f..56d377b 100644
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -29,12 +29,15 @@ EXTRA_DIST += \
rhel/usr_lib_systemd_system_openvswitch.service \
rhel/usr_lib_systemd_system_ovsdb-server.service \
rhel/usr_lib_systemd_system_ovs-vswitchd.service \
+ rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
rhel/usr_lib_systemd_system_ovn-controller.service \
rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
rhel/usr_lib_systemd_system_ovn-northd.service \
rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml
+DISTCLEANFILES += rhel/usr_lib_systemd_system_ovs-vswitchd.service
+
update_rhel_spec = \
$(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
< $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
@@ -46,6 +49,8 @@ $(srcdir)/rhel/openvswitch-dkms.spec:
rhel/openvswitch-dkms.spec.in $(top_buildd
$(srcdir)/rhel/openvswitch-kmod-rhel6.spec:
rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status
$(update_rhel_spec)
+rhel/usr_lib_systemd_system_ovs-vswitchd.service:
rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
$(top_builddir)/config.status
+
$(srcdir)/rhel/openvswitch-kmod-fedora.spec:
rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status
$(update_rhel_spec)
diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service
b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
similarity index 100%
rename from rhel/usr_lib_systemd_system_ovs-vswitchd.service
rename to rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
--
2.9.4
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
