summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-10-10 16:43:10 -0400
committerDave Reisner <dreisner@archlinux.org>2012-10-17 09:54:53 -0400
commit22349cee29b31cde7ef8582b4882475f553af97a (patch)
tree0f44a8984abf2b92def3014cdb237759c8e483e7 /src/core
parent5e6870eab5aa00675e4cd2f914fd1c25642fc964 (diff)
Properly handle device aliases used as dependencies
If a device unit has aliases defined in udev rules, and there are other units that depend on that alias, as in BindTo=sys-subsystem-net-devices-eth0.device then systemd will fail the start the alias, and any dependent units will time out. See https://bugs.freedesktop.org/show_bug.cgi?id=52580 This is because unit_add_name() in device_add_escaped_name() will return EEXIST. The solution taken here is to call device_update_unit() on the alias name. Thus if a unit with the alias name already exists, we reuse it; otherwise a new unit is created. Creating multiple units for a single device is perhaps suboptimal, but it's consistent with the treatment of udev symlinks in device_process_new_device().
Diffstat (limited to 'src/core')
-rw-r--r--src/core/device.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/device.c b/src/core/device.c
index 8121dc95d1..be76cafaed 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -269,11 +269,8 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, e);
free(e);
} else {
-
- r = device_add_escaped_name(u, e);
+ device_update_unit(m, dev, e, false);
free(e);
- if (r < 0)
- goto fail;
}
}
}