fix networking.service ordering

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/patches/pve/0007-networking.service-fix-dependencies-and-ordering.patch b/debian/patches/pve/0007-networking.service-fix-dependencies-and-ordering.patch
new file mode 100644 (file)
index 0000000..8ca4706
--- /dev/null
+++ b/debian/patches/pve/0007-networking.service-fix-dependencies-and-ordering.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Thu, 30 Jan 2020 12:48:23 +0100
+Subject: [PATCH] networking.service: fix dependencies and ordering
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/ifupdown2.networking.service | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/debian/ifupdown2.networking.service b/debian/ifupdown2.networking.service
+index b2acd97..ad9bad3 100644
+--- a/debian/ifupdown2.networking.service
++++ b/debian/ifupdown2.networking.service
+@@ -2,8 +2,10 @@
+ Description=Network initialization
+ Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8)
+ DefaultDependencies=no
+-Before=shutdown.target
+ Conflicts=shutdown.target
++Wants=network.target
++After=local-fs.target network-pre.target apparmor.service systemd-sysctl.service systemd-modules-load.service
++Before=network.target shutdown.target network-online.target
+ 
+ [Service]
+ Type=oneshot
+@@ -15,4 +17,4 @@ ExecStop=/sbin/ifdown -a
+ ExecReload=/sbin/ifreload -a
+ 
+ [Install]
+-WantedBy=basic.target network.target shutdown.target
++WantedBy=basic.target network-online.target shutdown.target

diff --git a/debian/patches/series b/debian/patches/series
index 41aafb76dc818ffa82a096a8e315c0c597f06fd3..3f39fc8f82e1d3c2e94657a2c79d1bc52e353dab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
 pve/0004-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch
 pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
 pve/0006-config-tuning.patch
+pve/0007-networking.service-fix-dependencies-and-ordering.patch