From: NeilBrown <neil@brown.name>
Date: Mon, 17 Jul 2017 08:03:34 +0000 (+1000)
Subject: fstab-generator: ignore x-systemd.device-timeout for non-devices (#6368)
X-Git-Tag: v235~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c67bd1f758f087496741ce0b3e227d82c6b4a304;p=thirdparty%2Fsystemd.git

fstab-generator: ignore x-systemd.device-timeout for non-devices (#6368)

If you specify "x-systemd.device-timeout" for an NFS mount
point, you get no warning and a meaningless device unit
dependency created.

Better to have a warning and no dependency.
---

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 2f459bf7786..86e9356dd11 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -198,6 +198,10 @@ int generator_write_timeouts(
         node = fstab_node_to_udev_node(what);
         if (!node)
                 return log_oom();
+        if (!is_device_path(node)) {
+                log_warning("x-systemd.device-timeout ignored for %s", what);
+                return 0;
+        }
 
         r = unit_name_from_path(node, ".device", &unit);
         if (r < 0)