Merge ~paelzer/ubuntu/+source/openvswitch:lp-1910209-runtime-dir-FOCAL into ~ubuntu-server-dev/ubuntu/+source/openvswitch:ubuntu/focal

[Christian Ehrhardt ]

Unmerged commits

b146b6c... by Christian Ehrhardt  on 2021-01-11

changelog: avoid removing the state dir (LP: #1910209)

Signed-off-by: Christian Ehrhardt <email address hidden>

d6b3ae7... by Christian Ehrhardt  on 2021-01-07

d/openvswitch-switch.ovsdb-server.service: avoid removing the state dir (LP: #1910209)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index afbd2a8..e42ff64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-openvswitch (2.13.1-0ubuntu0.20.04.3) UNRELEASED; urgency=medium
+openvswitch (2.13.1-0ubuntu0.20.04.4) focal; urgency=medium
 
+  [ James Page ]
   * d/p/tc-ufid-replace-check.patch: Cherry pick TC related fix.
 
- -- James Page <[e-mail]>  Thu, 17 Dec 2020 11:53:02 +0000
+  [ Christian Ehrhardt ]
+  * d/openvswitch-switch.ovsdb-server.service: avoid removing the state
+    dir on restart (LP: #1910209)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 11 Jan 2021 16:09:18 +0100
 
 openvswitch (2.13.1-0ubuntu0.20.04.2) focal; urgency=medium
 
diff --git a/debian/openvswitch-switch.ovsdb-server.service b/debian/openvswitch-switch.ovsdb-server.service
index 243b0f0..2b37229 100644
--- a/debian/openvswitch-switch.ovsdb-server.service
+++ b/debian/openvswitch-switch.ovsdb-server.service
@@ -18,3 +18,4 @@ ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
            --no-monitor restart $OVS_CTL_OPTS
 RuntimeDirectory=openvswitch
 RuntimeDirectoryMode=0755
+RuntimeDirectoryPreserve=yes