mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
cdb64ac0d1
The service currently fails to run since the runtime directories aren't being created. Create the runtime directories and fixup the path to echo to get things working again. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
48 lines
2.4 KiB
Diff
48 lines
2.4 KiB
Diff
From 163020a5bba1323dc337d72d4771bb81d824b0dc Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Tue, 29 May 2018 18:57:46 +0000
|
|
Subject: [PATCH] systemd: update tool paths
|
|
|
|
We are using the rhel files but we install our tools in a slightly
|
|
different path, update accordingly.
|
|
|
|
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 | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
index 11b34c6..94c48f8 100644
|
|
--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
@@ -15,8 +15,8 @@ EnvironmentFile=/etc/openvswitch/default.conf
|
|
EnvironmentFile=-/etc/sysconfig/openvswitch
|
|
EnvironmentFile=-/run/openvswitch/useropts
|
|
@begin_dpdk@
|
|
-ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'
|
|
-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages
|
|
+ExecStartPre=-/bin/sh -c '/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'
|
|
+ExecStartPre=-/bin/chmod 0775 /dev/hugepages
|
|
@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 70da1ec..694598f 100644
|
|
--- a/rhel/usr_lib_systemd_system_ovsdb-server.service
|
|
+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
|
|
@@ -10,8 +10,8 @@ Type=forking
|
|
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; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--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; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVSUSER=--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
|
|
|