Merge ~paelzer/ubuntu/+source/openvswitch:avoid-runtime-dir-removal-lp-1910209 into ~ubuntu-server-dev/ubuntu/+source/openvswitch:master

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Trivial fix to bug 1910209, but I'm unsure about potential unwanted implications (read: do you have anything this Dir NEEDS to be cleared for).

Up to your review and consideration.

diff --git a/debian/changelog b/debian/changelog
index 6fa8016..6120c93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openvswitch (2.15.0~git20210104.def6eb1ea-0ubuntu3) hirsute; urgency=medium
+
+  * d/openvswitch-switch.ovsdb-server.service: avoid removing the state
+    dir on restart (LP: #1910209)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 07 Jan 2021 08:35:38 +0100
+
 openvswitch (2.15.0~git20210104.def6eb1ea-0ubuntu2) hirsute; urgency=medium
 
   * d/rules: Re-align expected test failure with test numbering on
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