1 files changed, 10 insertions, 6 deletions

diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
index 244a216d..f7ec3fa0 100644
--- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
+++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
@@ -1,6 +1,6 @@
-From ea98129777784b0e750a20078f01093dbdbe7b9b Mon Sep 17 00:00:00 2001
+From ae55fa8168b4b9692ad757c54255a89f935c587e Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 20 Oct 2020 14:14:06 +0800
+Date: Thu, 11 Mar 2021 11:35:24 +0800
 Subject: [PATCH] ovs: use /run instead of /var/run for in systemd units
 
 Upstream-Status: Pending
@@ -78,10 +78,10 @@ index f88b57cae..82748bf2d 100644
  EnvironmentFile=-/etc/sysconfig/openvswitch
  EnvironmentFile=-/run/openvswitch.useropts
 diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
-index 69b0bf61a..5f83f281f 100644
+index 74e5acb7f..39698f238 100644
 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service
 +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
-@@ -7,12 +7,12 @@ PartOf=openvswitch.service
+@@ -7,7 +7,7 @@ PartOf=openvswitch.service
  
  [Service]
  Type=forking
@@ -90,13 +90,17 @@ index 69b0bf61a..5f83f281f 100644
  Restart=on-failure
  EnvironmentFile=/etc/openvswitch/default.conf
  EnvironmentFile=-/etc/sysconfig/openvswitch
+@@ -17,8 +17,8 @@ EnvironmentFile=-/run/openvswitch.useropts
+ # remove openvswitch.useropts first to reload a fresh
+ # OVS_USER_ID from default.conf or sysconfig.
+ ExecStartPre=/bin/rm -f /run/openvswitch.useropts
 -ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
 -ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
 +ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch
 +ExecStartPre=-/bin/chown ${OVS_USER_ID} /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 '/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'
- EnvironmentFile=-/run/openvswitch.useropts
+ ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
 -- 
 2.17.1