diff options
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch')
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch index aae44fe7..7fe0236e 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch @@ -1,22 +1,24 @@ -From efd6b8f03ef7278d2477833f84bb8488bd0c346d Mon Sep 17 00:00:00 2001 +From a79bf6caf915d2a00a52a73033b1c903f2df894f Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Tue, 29 May 2018 18:57:46 +0000 +Date: Wed, 10 Mar 2021 11:17:37 +0800 Subject: [PATCH 1/2] systemd: update tool paths We are using the rhel files but we install our tools in a slightly different path, update accordingly. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++-- - rhel/usr_lib_systemd_system_ovsdb-server.service | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) + rhel/usr_lib_systemd_system_ovsdb-server.service | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -index ff43dae..f88b57c 100644 ---- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -@@ -17,8 +17,8 @@ EnvironmentFile=-/etc/sysconfig/openvswitch +Index: git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +=================================================================== +--- git.orig/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in ++++ git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +@@ -17,8 +17,8 @@ EnvironmentFile=-/run/openvswitch.useropts LimitSTACK=2M @begin_dpdk@ @@ -27,23 +29,23 @@ index ff43dae..f88b57c 100644 @end_dpdk@ ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ -diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index 4c170c0..aad557f 100644 ---- a/rhel/usr_lib_systemd_system_ovsdb-server.service -+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -11,9 +11,9 @@ PIDFile=/var/run/openvswitch/ovsdb-server.pid - Restart=on-failure - EnvironmentFile=/etc/openvswitch/default.conf - EnvironmentFile=-/etc/sysconfig/openvswitch --ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch --ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' +Index: git/rhel/usr_lib_systemd_system_ovsdb-server.service +=================================================================== +--- git.orig/rhel/usr_lib_systemd_system_ovsdb-server.service ++++ git/rhel/usr_lib_systemd_system_ovsdb-server.service +@@ -16,11 +16,11 @@ + # Environment is reloaded for each Exec*, make sure to + # remove openvswitch.useropts first to reload a fresh + # OVS_USER_ID from default.conf or sysconfig. +-ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts ++ExecStartPre=/bin/rm -f /run/openvswitch.useropts + +-ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch +-ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' -ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' -+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/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ++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 \ --no-ovs-vswitchd --no-monitor --system-id=random \ --- -2.7.4 - + ${OVS_USER_OPT} \ |