proxmox-mirrors/ifupdown2
1
0
Fork 0
mirror of https://git.proxmox.com/git/ifupdown2 synced 2025-04-29 01:54:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

followup: restore service ordering state as previous

Browse Source 
commit 214bc505ac removed this by
mistake. While I fix it before detecting that (thank Wolfgang!) lets
restore it more like the state it was.

Add missing ordering:
  After=network-pre.target
    See systemd.special(7)'s description of this target
  After=systemd-sysctl.service
    ifupdown does the same - we want net.*.conf.default.*
    sysctl keys to apply to newly created interfaces
  After=systemd-modules-load.service
    ifupdown does the same, though this should be mostly
    optional as modules should be autoloaded anyway
  Before=network.target
    This is required to prevent services which require
    network to be started too early and listen on wrong
    addresses (iow. only on loopback or ipv4-only).
  Before=network-online.target
    See systemd.special(7)'s description. We are the
    provider of this target.
  Before=shutdown.target
    ifupdown does it this way, it also makes more sense
    given the Conflict entry, compared to the previous
    WantedBy entry in [Install]

Changed install section:
  WantedBy=multi-user.target
    I wasn't sure about this. ifupdown does this.
    basic.target didn't seem useful since we actually want:
  WantedBy=network-online.target
    We provide this, so we should be installed into it.
  removed WantedBy=network.target
    We strictly want to be ordered before this and instead
    are required by multi-user.target already.
  removed WantedBy=shutdown.target
    I didn't see the point.

Originally-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-01-30 13:45:47 +01:00
parent 41e45a2fb6
commit fbe4b342ea
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/patches/pve/0007-networking.service-fix-dependencies-and-ordering.patch vendored
View File

@ -3,6 +3,17 @@ From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 30 Jan 2020 12:48:23 +0100 Date: Thu, 30 Jan 2020 12:48:23 +0100
Subject: [PATCH] networking.service: fix dependencies and ordering Subject: [PATCH] networking.service: fix dependencies and ordering
IMPORTANT: DO NOT REMOVE IF UNSURE!
ONLY IF IFUPDOWN2 FIXED THEIR SERVICE MESS.
THEY CLOSED TWO PULL REQUESTS ALREADY WITHOUT REASON.
SO WE JUST HAVE TO KEEP THIS DOWNSTREAM PATCH!
BIG WARNING HERE IS DONE BECAUSE IT WAS ALREADY REMOVED BY MISTAKE
ONCE!!
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ifupdown2.networking.service | 6 ++++-- debian/ifupdown2.networking.service | 6 ++++--
@ -19,7 +30,7 @@ index b2acd97..ad9bad3 100644
-Before=shutdown.target -Before=shutdown.target
Conflicts=shutdown.target Conflicts=shutdown.target
+Wants=network.target +Wants=network.target
+After=local-fs.target network-pre.target apparmor.service systemd-sysctl.service systemd-modules-load.service +After=local-fs.target network-pre.target systemd-sysctl.service systemd-modules-load.service
+Before=network.target shutdown.target network-online.target +Before=network.target shutdown.target network-online.target
[Service] [Service]
@ -29,4 +40,4 @@ index b2acd97..ad9bad3 100644
[Install] [Install]
-WantedBy=basic.target network.target shutdown.target -WantedBy=basic.target network.target shutdown.target
+WantedBy=basic.target network-online.target shutdown.target +WantedBy=multi-user.target network-online.target