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 | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 00000000..9a792e63 --- /dev/null +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From f45c0a9d712113417e7b56c199f8576b470695ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Tue, 29 May 2018 18:57:46 +0000 | ||
4 | Subject: [PATCH] systemd: update tool paths | ||
5 | |||
6 | We are using the rhel files but we install our tools in a slightly | ||
7 | different path, update accordingly. | ||
8 | |||
9 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
10 | --- | ||
11 | rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++-- | ||
12 | rhel/usr_lib_systemd_system_ovsdb-server.service | 2 +- | ||
13 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | ||
16 | index 11b34c6..94c48f8 100644 | ||
17 | --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | ||
18 | +++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | ||
19 | @@ -15,8 +15,8 @@ EnvironmentFile=/etc/openvswitch/default.conf | ||
20 | EnvironmentFile=-/etc/sysconfig/openvswitch | ||
21 | EnvironmentFile=-/run/openvswitch/useropts | ||
22 | @begin_dpdk@ | ||
23 | -ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages' | ||
24 | -ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages | ||
25 | +ExecStartPre=-/bin/sh -c '/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages' | ||
26 | +ExecStartPre=-/bin/chmod 0775 /dev/hugepages | ||
27 | @end_dpdk@ | ||
28 | ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ | ||
29 | --no-ovsdb-server --no-monitor --system-id=random \ | ||
30 | diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service | ||
31 | index 0fa57a9..75c9e02 100644 | ||
32 | --- a/rhel/usr_lib_systemd_system_ovsdb-server.service | ||
33 | +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service | ||
34 | @@ -10,7 +10,7 @@ Type=forking | ||
35 | Restart=on-failure | ||
36 | EnvironmentFile=/etc/openvswitch/default.conf | ||
37 | EnvironmentFile=-/etc/sysconfig/openvswitch | ||
38 | -ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch | ||
39 | +ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch | ||
40 | 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' | ||
41 | EnvironmentFile=-/run/openvswitch/useropts | ||
42 | ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ | ||
43 | -- | ||
44 | 2.7.4 | ||
45 | |||