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

[Christian Ehrhardt ]

Unmerged commits

23d8e85... by Christian Ehrhardt  on 2021-01-11

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

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

3c4e5c1... 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 9ca536d..2269cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openvswitch (2.9.7-0ubuntu0.18.04.2) bionic; urgency=medium
+
+  * d/openvswitch-switch.ovsdb-server.service: avoid removing the state
+    dir on restart (LP: #1910209)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 11 Jan 2021 16:10:07 +0100
+
 openvswitch (2.9.7-0ubuntu0.18.04.1) bionic; urgency=medium
 
   [ James Page ]
diff --git a/debian/openvswitch-switch.ovsdb-server.service b/debian/openvswitch-switch.ovsdb-server.service
index 342c001..771e60e 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