MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: enable systemd support

Browse Source 
Make the necessary updates to get openvswitch to be compatible with
systemd. Up to now if you built a systemd supported image openvswitch
was using the systemd sysvinit wrappers, by making these changes we
now support systemd natively.

Note that there is no equivalent systemd support for
openvswitch-testcontroller. Following the lead of upstream this
is not something that should be run by the init system.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Mark Asselstine 2015-12-11 12:28:25 -05:00 committed by Bruce Ashfield
parent 5181ec2259
commit f7dcf5bce9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recipes-networking/openvswitch/openvswitch.inc
View File

@ -61,13 +61,21 @@ FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd"
FILES_${PN}-switch = "\ FILES_${PN}-switch = "\
${sysconfdir}/init.d/openvswitch-switch \ ${sysconfdir}/init.d/openvswitch-switch \
${sysconfdir}/default/openvswitch-switch \ ${sysconfdir}/default/openvswitch-switch \
${systemd_unitdir}/system/openvswitch.service \
${systemd_unitdir}/system/openvswitch-nonetwork.service \
" "
# silence a warning # silence a warning
FILES_${PN} += "${datadir}/ovsdbmonitor" FILES_${PN} += "${datadir}/ovsdbmonitor"
FILES_${PN} += "/run" FILES_${PN} += "/run"
inherit autotools update-rc.d inherit autotools update-rc.d systemd
SYSTEMD_PACKAGES = "${PN}-switch"
SYSTEMD_SERVICE_${PN}-switch = " \
openvswitch-nonetwork.service \
openvswitch-switch.service \
"
INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller"
INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch"
@ -87,7 +95,11 @@ do_install_append() {
install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
true || rm -fr ${D}/${datadir}/${PN}/pki true || rm -fr ${D}/${datadir}/${PN}/pki
install -d ${D}/${sysconfdir}/init.d/ install -d ${D}/${systemd_unitdir}/system/
install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch.service \
${D}/${systemd_unitdir}/system/openvswitch-switch.service
install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \
${D}/${systemd_unitdir}/system/openvswitch-nonetwork.service
oe_runmake modules_install INSTALL_MOD_PATH=${D} oe_runmake modules_install INSTALL_MOD_PATH=${D}
} }