From 1e3c464ce1e5f7b91ae10739792c67e97c84c43a Mon Sep 17 00:00:00 2001

From: Alexey Shabalin <shaba@altlinux.org>

Date: Fri, 21 Aug 2020 02:49:48 +0300

Subject: [PATCH] update systemd unit for ALT

# Conflicts:

#	rhel/usr_lib_systemd_system_ovsdb-server.service

---

 rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ----

 rhel/usr_lib_systemd_system_ovsdb-server.service    | 8 ++++----

 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in

index 647652141..4a39f8164 100644

--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in

+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in

@@ -17,10 +17,6 @@ EnvironmentFile=/etc/openvswitch/default.conf

 EnvironmentFile=-/etc/sysconfig/openvswitch

 EnvironmentFile=-/run/openvswitch.useropts

 LimitSTACK=2M

-@begin_dpdk@

-ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'

-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages

-@end_dpdk@

 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \

           --no-ovsdb-server --no-monitor --system-id=random \

           ${OVS_USER_OPT} \

diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service

index 80209b959..078ccbe27 100644

--- a/rhel/usr_lib_systemd_system_ovsdb-server.service

+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service

@@ -17,11 +17,11 @@ EnvironmentFile=-/run/openvswitch.useropts

 # 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} /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'

 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \

           --no-ovs-vswitchd --no-monitor --system-id=random \

           ${OVS_USER_OPT} \

-- 

2.33.0