From 28cca9a78e91adc800e079588797df4cf82a378b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 20 Oct 2020 14:59:28 +0800 Subject: openvswitch: use /run instead of /var/run in systemd service file /var/run has been deprecated by systemd, so use /run instead, as suggested by systemd. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- ...n-instead-of-var-run-for-in-systemd-units.patch | 102 +++++++++++++++++++++ recipes-networking/openvswitch/openvswitch_git.bb | 1 + 2 files changed, 103 insertions(+) create mode 100644 recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch new file mode 100644 index 00000000..244a216d --- /dev/null +++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch @@ -0,0 +1,102 @@ +From ea98129777784b0e750a20078f01093dbdbe7b9b Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 20 Oct 2020 14:14:06 +0800 +Subject: [PATCH] ovs: use /run instead of /var/run for in systemd units + +Upstream-Status: Pending + +Signed-off-by: Chen Qi +--- + rhel/etc_logrotate.d_openvswitch | 4 ++-- + rhel/usr_lib_systemd_system_openvswitch-ipsec.service | 2 +- + ...sr_lib_systemd_system_ovs-delete-transient-ports.service | 2 +- + rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 6 +++--- + rhel/usr_lib_systemd_system_ovsdb-server.service | 6 +++--- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch +index f4302ffbc..c0f476744 100644 +--- a/rhel/etc_logrotate.d_openvswitch ++++ b/rhel/etc_logrotate.d_openvswitch +@@ -13,8 +13,8 @@ + missingok + postrotate + # Tell Open vSwitch daemons to reopen their log files +- if [ -d /var/run/openvswitch ]; then +- for ctl in /var/run/openvswitch/*.ctl; do ++ if [ -d /run/openvswitch ]; then ++ for ctl in /run/openvswitch/*.ctl; do + ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : + done + fi +diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service +index d8f47af68..92dad44f9 100644 +--- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service ++++ b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service +@@ -5,7 +5,7 @@ After=openvswitch.service + + [Service] + Type=forking +-PIDFile=/var/run/openvswitch/ovs-monitor-ipsec.pid ++PIDFile=/run/openvswitch/ovs-monitor-ipsec.pid + ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ + --ike-daemon=libreswan start-ovs-ipsec + ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec +diff --git a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service +index 4cd4d7f57..d4d7b204b 100644 +--- a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ++++ b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service +@@ -2,7 +2,7 @@ + Description=Open vSwitch Delete Transient Ports + After=ovsdb-server.service + Before=ovs-vswitchd.service +-AssertPathExists=/var/run/openvswitch/db.sock ++AssertPathExists=/run/openvswitch/db.sock + + [Service] + Type=oneshot +diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +index f88b57cae..82748bf2d 100644 +--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in ++++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +@@ -4,14 +4,14 @@ After=ovsdb-server.service network-pre.target systemd-udev-settle.service + Before=network.target network.service + Requires=ovsdb-server.service + ReloadPropagatedFrom=ovsdb-server.service +-AssertPathIsReadWrite=/var/run/openvswitch/db.sock ++AssertPathIsReadWrite=/run/openvswitch/db.sock + PartOf=openvswitch.service + + [Service] + Type=forking +-PIDFile=/var/run/openvswitch/ovs-vswitchd.pid ++PIDFile=/run/openvswitch/ovs-vswitchd.pid + Restart=on-failure +-Environment=XDG_RUNTIME_DIR=/var/run/openvswitch ++Environment=XDG_RUNTIME_DIR=/run/openvswitch + EnvironmentFile=/etc/openvswitch/default.conf + EnvironmentFile=-/etc/sysconfig/openvswitch + EnvironmentFile=-/run/openvswitch.useropts +diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service +index 69b0bf61a..5f83f281f 100644 +--- a/rhel/usr_lib_systemd_system_ovsdb-server.service ++++ b/rhel/usr_lib_systemd_system_ovsdb-server.service +@@ -7,12 +7,12 @@ PartOf=openvswitch.service + + [Service] + Type=forking +-PIDFile=/var/run/openvswitch/ovsdb-server.pid ++PIDFile=/run/openvswitch/ovsdb-server.pid + Restart=on-failure + EnvironmentFile=/etc/openvswitch/default.conf + EnvironmentFile=-/etc/sysconfig/openvswitch +-ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch +-ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch ++ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch ++ExecStartPre=-/bin/chown ${OVS_USER_ID} /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/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 +-- +2.17.1 + diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index 07258be7..fa1ec4dc 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb @@ -31,6 +31,7 @@ SRC_URI = "file://openvswitch-switch \ file://python-switch-remaining-scripts-to-use-python3.patch \ file://systemd-update-tool-paths.patch \ file://systemd-create-runtime-dirs.patch \ + file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" -- cgit v1.2.3-54-g00ecf