rebase 0007-networking.service-fix-dependencies-and-ordering.patch

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-06-02 10:31:16 +02:00 committed by Thomas Lamprecht
parent fe94b8bc6c
commit 606a00b69b

View File

@ -1,4 +1,4 @@
From 0aa90eb35e22ca156f6ab8fafd30071211bc3e50 Mon Sep 17 00:00:00 2001
From e8ce294b4db6039216b72e353a51d1bac0c5313d 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
@ -17,14 +17,14 @@ ONCE!!
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
debian/ifupdown2-pre.service | 13 +++++++++++++
debian/ifupdown2.networking.service | 7 +++++--
debian/ifupdown2.networking.service | 8 ++++++--
debian/rules | 1 +
3 files changed, 19 insertions(+), 2 deletions(-)
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 debian/ifupdown2-pre.service
diff --git a/debian/ifupdown2-pre.service b/debian/ifupdown2-pre.service
new file mode 100644
index 0000000..f0fb308
index 0000000..b129a62
--- /dev/null
+++ b/debian/ifupdown2-pre.service
@@ -0,0 +1,13 @@
@ -42,7 +42,7 @@ index 0000000..f0fb308
+EnvironmentFile=-/etc/default/networking
+ExecStart=/bin/udevadm settle
diff --git a/debian/ifupdown2.networking.service b/debian/ifupdown2.networking.service
index b2acd97..8f54dc6 100644
index 32f21f6..a49d1ba 100644
--- a/debian/ifupdown2.networking.service
+++ b/debian/ifupdown2.networking.service
@@ -2,8 +2,11 @@
@ -58,14 +58,15 @@ index b2acd97..8f54dc6 100644
[Service]
Type=oneshot
@@ -15,4 +18,4 @@ ExecStop=/sbin/ifdown -a
ExecReload=/sbin/ifreload -a
@@ -16,4 +19,5 @@ ExecStop=/usr/share/ifupdown2/sbin/start-networking stop
ExecReload=/usr/share/ifupdown2/sbin/start-networking reload
[Install]
-WantedBy=basic.target network.target shutdown.target
+WantedBy=multi-user.target network-online.target
+
diff --git a/debian/rules b/debian/rules
index 6274b3a..9168c08 100755
index ea6f434..fcb304f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_install: