diff options
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch')
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch index 12b9e17a..1505d47a 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch @@ -9,24 +9,23 @@ upstream service file uses 'chown' we will match this by using 'mkdir'. Without this the service will fail to start since these directories won't exist. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- rhel/usr_lib_systemd_system_ovsdb-server.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index 5002ddf10..74e5acb7f 100644 ---- a/rhel/usr_lib_systemd_system_ovsdb-server.service -+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -17,7 +17,7 @@ EnvironmentFile=-/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 +@@ -17,7 +17,7 @@ # 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/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' --- -2.17.1 - |