From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 25 Sep 2016 12:34:30 +0000 (-0400)
Subject: core: complain if Before= dep on .device is declared
X-Git-Tag: v232~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd5e7000cb54f94fdf4756a28144ab32d6e214c8;p=thirdparty%2Fsystemd.git

core: complain if Before= dep on .device is declared

[Unit]
Before=foobar.device

[Service]
ExecStart=/bin/true
Type=oneshot

$ systemd-analyze verify before-device.service
before-device.service: Dependency Before=foobar.device ignored (.device units cannot be delayed)
---

diff --git a/TODO b/TODO
index 64d530b7d71..ff9e9be9fb6 100644
--- a/TODO
+++ b/TODO
@@ -139,8 +139,6 @@ Features:
 
 * PID 1 should send out sd_notify("WATCHDOG=1") messages (for usage in the --user mode, and when run via nspawn)
 
-* consider throwing a warning if a service declares it wants to be "Before=" a .device unit.
-
 * there's probably something wrong with having user mounts below /sys,
   as we have for debugfs. for exmaple, src/core/mount.c handles mounts
   prefixed with /sys generally special.
diff --git a/src/core/unit.c b/src/core/unit.c
index 5d284a359d8..693f75c9283 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2225,6 +2225,11 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
                 return 0;
         }
 
+        if (d == UNIT_BEFORE && other->type == UNIT_DEVICE) {
+                log_unit_warning(u, "Dependency Before=%s ignored (.device units cannot be delayed)", other->id);
+                return 0;
+        }
+
         r = set_ensure_allocated(&u->dependencies[d], NULL);
         if (r < 0)
                 return r;