Revert "ifup@.service: Lessen dependencies"

This reverts commit 355bf7059921c2200b1bd3d9a9fd4ed35ed97e2e.

Before we can do this in Debian, we need to integrate ifup@.service into
network-online.target, like in Ubuntu:

  http://launchpadlibrarian.net/195375040/ifupdown_0.7.48.1ubuntu5_0.7.48.1ubuntu6.diff.gz

diff --git a/debian/changelog b/debian/changelog
index aa0059a811d02b78d8ae5c457bcf49c892eee31c..36edbeb286c0a2257ed8b128f6d919987d6924c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,6 @@ systemd (218-6) UNRELEASED; urgency=medium
 
   * initramfs hook: Install 61-persistant-storage-android.rules if it exists.
   * Generate POT file during package build, for translators.
-  * ifup@.service: Drop dependency on networking.service (i. e.
-    /etc/init.d/networking), and merely ensure that /run/network exists. This
-    avoids unnecessary dependencies/waiting during boot, and dependency cycles
-    if hooks wait for other interfaces to come up (like ifenslave with bonding
-    interfaces). (LP: #1414544)
   * Pull latest keymaps from upstream git.
   * Order ifup@.service and networking.service after network-pre.target.
     (Closes: #766938)

diff --git a/debian/extra/ifup@.service b/debian/extra/ifup@.service
index cfff8081ee874ad17be1c4df83bed90db86939d1..7eb2f1020221e42b5b7e83e3875271f2e71ce412 100644 (file)
--- a/debian/extra/ifup@.service
+++ b/debian/extra/ifup@.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=ifup for %I
-After=local-fs.target network-pre.target
+After=local-fs.target network-pre.target networking.service
 Before=network.target
 BindsTo=sys-subsystem-net-devices-%i.device
+ConditionPathIsDirectory=/run/network
 DefaultDependencies=no
 
 [Service]
 Type=oneshot
-RuntimeDirectory=network
 ExecStart=/sbin/ifup --allow=hotplug %I
 ExecStartPost=/sbin/ifquery --state %I
 ExecStop=/sbin/ifdown %I