mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00

A mostly straightforward uprev. Unfortunately a required patch for python3 is only available on a non-release branch so we must carry it in order to build (the discussion on the mailing list was that an uprev might have avoided this, but this is not the case). The ptest results are similar to after the v2.11 uprev ERROR: 2413 tests were run, 23 failed unexpectedly. 383 tests were skipped. NOTE, however, that they have now marked many tests as 'skipped', such as the python2 results, so the failed and skipped numbers have essentially swapped with each other. The failed tests were in the following areas: checkpatch.at (5) ovs-ofctl.at (1) dpif-netdev.at (1) ofproto-dpif.at (6) bridge.at (2) ovn.at (2) ovn-controller-vtep.at (6) Most were issues with the test or expectations that source code would be available. There might be an issue around packaging of "/vswitchd/vswitch.ovsschema" but we should be able to overlook this for now, as we have with previous versions. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 6876e0c155b7f83e1f8545446e2dd69c2b7989f2 Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Tue, 4 Sep 2018 15:38:59 -0400
|
|
Subject: [PATCH] systemd: create runtime dirs
|
|
|
|
The recommendation would be to make use of "RuntimeDirectory=" and
|
|
"RuntimeDirectoryMode=" instead of 'mkdir' and 'chown' but since the
|
|
upstream service file uses 'chown' we will match this by using
|
|
'mkdir'. Without this the service will fail to start since these
|
|
directories won't exist.
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
---
|
|
rhel/usr_lib_systemd_system_ovsdb-server.service | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
|
|
index aad557f..69b0bf6 100644
|
|
--- a/rhel/usr_lib_systemd_system_ovsdb-server.service
|
|
+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
|
|
@@ -11,6 +11,7 @@ PIDFile=/var/run/openvswitch/ovsdb-server.pid
|
|
Restart=on-failure
|
|
EnvironmentFile=/etc/openvswitch/default.conf
|
|
EnvironmentFile=-/etc/sysconfig/openvswitch
|
|
+ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
|
|
ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
|
|
ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
|
|
ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
|
|
--
|
|
2.7.4
|
|
|