X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdevice.c;h=2cbb81aebdfb4dfb9e4e95242eb59b6215114bc1;hp=526e7143785b8d684e2b53faec475dcbc6459f80;hb=f031e85fc0a11636445e0bf50493c705942dd03f;hpb=8fe914ec81d9f57bcc083036f528b00119ed2e3b diff --git a/src/device.c b/src/device.c index 526e71437..2cbb81aeb 100644 --- a/src/device.c +++ b/src/device.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -40,22 +40,21 @@ static void device_unset_sysfs(Device *d) { assert(d); - if (d->sysfs) { - /* Remove this unit from the chain of devices which share the - * same sysfs path. */ - first = hashmap_get(d->meta.manager->devices_by_sysfs, d->sysfs); - LIST_REMOVE(Device, same_sysfs, first, d); + if (!d->sysfs) + return; - if (first) - hashmap_remove_and_replace(d->meta.manager->devices_by_sysfs, d->sysfs, first->sysfs, first); - else - hashmap_remove(d->meta.manager->devices_by_sysfs, d->sysfs); + /* Remove this unit from the chain of devices which share the + * same sysfs path. */ + first = hashmap_get(d->meta.manager->devices_by_sysfs, d->sysfs); + LIST_REMOVE(Device, same_sysfs, first, d); - free(d->sysfs); - d->sysfs = NULL; - } + if (first) + hashmap_remove_and_replace(d->meta.manager->devices_by_sysfs, d->sysfs, first->sysfs, first); + else + hashmap_remove(d->meta.manager->devices_by_sysfs, d->sysfs); - d->meta.following = NULL; + free(d->sysfs); + d->sysfs = NULL; } static void device_init(Unit *u) { @@ -189,14 +188,14 @@ 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 a different unit already claimed this name then let's do + * nothing. This can happen for example when two disks with + * the same label are plugged in, and which hence try to get + * conflicting symlinks in /dev/disk/by-label/xxxx */ + if (u && DEVICE(u)->sysfs && !path_equal(DEVICE(u)->sysfs, sysfs)) return -EEXIST; - } if (!u) { - Device *first; delete = true; if (!(u = unit_new(m))) @@ -205,13 +204,22 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p if ((r = device_add_escaped_name(u, path)) < 0) goto fail; + unit_add_to_load_queue(u); + } else + delete = false; + + /* If this was created via some dependency and has not + * actually been seen yet ->sysfs will not be + * initialized. Hence initialize it if necessary. */ + + if (!DEVICE(u)->sysfs) { + Device *first; + if (!(DEVICE(u)->sysfs = strdup(sysfs))) { r = -ENOMEM; goto fail; } - unit_add_to_load_queue(u); - if (!m->devices_by_sysfs) if (!(m->devices_by_sysfs = hashmap_new(string_hash_func, string_compare_func))) { r = -ENOMEM; @@ -223,9 +231,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p if ((r = hashmap_replace(m->devices_by_sysfs, DEVICE(u)->sysfs, first)) < 0) goto fail; - - } else - delete = false; + } if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) || (model = udev_device_get_property_value(dev, "ID_MODEL"))) { @@ -268,10 +274,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p goto fail; } } - - u->meta.following = NULL; - } else - device_find_escape_name(m, sysfs, &u->meta.following); + } unit_add_to_dbus_queue(u); return 0; @@ -305,6 +308,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); @@ -313,6 +317,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); } @@ -365,6 +381,30 @@ static int device_process_removed_device(Manager *m, struct udev_device *dev) { return 0; } +static Unit *device_following(Unit *u) { + Device *d = DEVICE(u); + Device *other, *first = NULL; + + assert(d); + + if (startswith(u->meta.id, "sys-")) + return NULL; + + /* Make everybody follow the unit that's named after the sysfs path */ + for (other = d->same_sysfs_next; other; other = other->same_sysfs_next) + if (startswith(other->meta.id, "sys-")) + return UNIT(other); + + for (other = d->same_sysfs_prev; other; other = other->same_sysfs_prev) { + if (startswith(other->meta.id, "sys-")) + return UNIT(other); + + first = other; + } + + return UNIT(first); +} + static void device_shutdown(Manager *m) { assert(m); @@ -497,7 +537,6 @@ const UnitVTable device_vtable = { .no_instances = true, .no_snapshots = true, .no_isolate = true, - .no_alias = true, .init = device_init, @@ -510,7 +549,11 @@ 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, .enumerate = device_enumerate, .shutdown = device_shutdown