device: set recursive_stop=true by default

[elogind.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index c1d1b9ab09d3c21f41568e697eb0135a8671cece..0ddd3b3d09734f7e7fe5dd668b01fd68993e8a6a 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -69,6 +69,12 @@ static void device_init(Unit *u) {
          * happen for the other units since their operations time out
          * anyway. */
         d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
+
+        /* We enable recursive stopping by default for all
+        devices. This enables the user to use Requires= to make a
+        service go a way when a device goes away, and Wants=
+        otherwise. */
+        d->meta.recursive_stop = true;
 }
 
 static void device_done(Unit *u) {
@@ -188,11 +194,8 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
         if ((r = device_find_escape_name(m, path, &u)) < 0)
                 return r;
 
-        /* If this is a different unit, then let's not merge things */
-        if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs)) {
-                log_error("Hmm, something's broken. Asked to create two devices with same name but different sysfs paths.");
+        if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs))
                 return -EEXIST;
-        }
 
         if (!u) {
                 delete = true;
@@ -307,6 +310,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
         first = udev_device_get_devlinks_list_entry(dev);
         udev_list_entry_foreach(item, first) {
                 const char *p;
+                struct stat st;
 
                 /* Don't bother with the /dev/block links */
                 p = udev_list_entry_get_name(item);
@@ -315,6 +319,18 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
                     path_startswith(p, "/dev/char/"))
                         continue;
 
+                /* Verify that the symlink in the FS actually belongs
+                 * to this device. This is useful to deal with
+                 * conflicting devices, e.g. when two disks want the
+                 * same /dev/disk/by-label/xxx link because they have
+                 * the same label. We want to make sure that the same
+                 * device that won the symlink wins in systemd, so we
+                 * check the device node major/minor*/
+                if (stat(p, &st) >= 0)
+                        if ((!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode)) ||
+                            st.st_rdev != udev_device_get_devnum(dev))
+                                continue;
+
                 device_update_unit(m, dev, p, false);
         }
 
@@ -523,7 +539,6 @@ const UnitVTable device_vtable = {
         .no_instances = true,
         .no_snapshots = true,
         .no_isolate = true,
-        .no_alias = true,
 
         .init = device_init,
 
@@ -536,7 +551,9 @@ const UnitVTable device_vtable = {
         .active_state = device_active_state,
         .sub_state_to_string = device_sub_state_to_string,
 
+        .bus_interface = "org.freedesktop.systemd1.Device",
         .bus_message_handler = bus_device_message_handler,
+        .bus_invalidating_properties =  bus_device_invalidating_properties,
 
         .following = device_following,