Merge ~chris.macnaughton/ubuntu/+source/openvswitch:bug/1887177 into ~ubuntu-server-dev/ubuntu/+source/openvswitch:master

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 7b8455adde4a77b2c53841f1e7dbe0e7aa96f368
Proposed branch: ~chris.macnaughton/ubuntu/+source/openvswitch:bug/1887177
Merge into: ~ubuntu-server-dev/ubuntu/+source/openvswitch:master
Diff against target: 32 lines (+8/-2)
2 files modified
debian/changelog (+7/-1)
debian/openvswitch-switch.ovsdb-server.service (+1/-1)
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+387852@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9831043..c0a61ed 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,8 +1,14 @@
6 openvswitch (2.13.0-0ubuntu2) UNRELEASED; urgency=medium
7
8+ [ James Page ]
9 * d/watch: Update to use github.com releases.
10
11- -- James Page <james.page@ubuntu.com> Thu, 28 May 2020 07:47:12 +0100
12+ [ Chris MacNaughton ]
13+ * d/openvswitch-switch.ovsdb-server.service: Add local-fs.target to
14+ systemd service file to ensure that local filesystems are ready
15+ before the ovsdb service tries to start (LP: #1887177).
16+
17+ -- Chris MacNaughton <chris.macnaughton@canonical.com> Wed, 22 Jul 2020 14:31:57 +0000
18
19 openvswitch (2.13.0-0ubuntu1) focal; urgency=medium
20
21diff --git a/debian/openvswitch-switch.ovsdb-server.service b/debian/openvswitch-switch.ovsdb-server.service
22index 178f470..63a1ced 100644
23--- a/debian/openvswitch-switch.ovsdb-server.service
24+++ b/debian/openvswitch-switch.ovsdb-server.service
25@@ -1,6 +1,6 @@
26 [Unit]
27 Description=Open vSwitch Database Unit
28-After=syslog.target network-pre.target dpdk.service
29+After=syslog.target network-pre.target dpdk.service local-fs.target
30 Before=network.target networking.service
31 PartOf=openvswitch-switch.service
32 DefaultDependencies=no

Subscribers

People subscribed via source and target branches