/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
#include <errno.h>
#include <sys/epoll.h>
#include <libudev.h>
return state_translation_table[DEVICE(u)->state];
}
-static int device_add_escaped_name(Unit *u, const char *prefix, const char *dn, bool make_id) {
+static int device_add_escaped_name(Unit *u, const char *dn, bool make_id) {
char *e;
int r;
assert(dn);
assert(dn[0] == '/');
- if (!(e = unit_name_escape_path(prefix, dn+1, ".device")))
+ if (!(e = unit_name_escape_path(dn+1, ".device")))
return -ENOMEM;
r = unit_add_name(u, e);
return -ENOMEM;
assert(sysfs[0] == '/');
- if (!(e = unit_name_escape_path("sysfs-", sysfs+1, ".device")))
+ if (!(e = unit_name_escape_path(sysfs+1, ".device")))
return -ENOMEM;
if (!(u = manager_get_unit(m, e))) {
}
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
- (model = udev_device_get_property_value(dev, "ID_MODEL")))
+ (model = udev_device_get_property_value(dev, "ID_MODEL"))) {
if ((r = unit_set_description(u, model)) < 0)
goto fail;
+ } else if (dn)
+ if ((r = unit_set_description(u, dn)) < 0)
+ goto fail;
unit_add_to_load_queue(u);
} else {
}
if (dn)
- if ((r = device_add_escaped_name(u, "node-", dn, true)) < 0)
+ if ((r = device_add_escaped_name(u, dn, true)) < 0)
goto fail;
first = udev_device_get_devlinks_list_entry(dev);
udev_list_entry_foreach(item, first)
- if ((r = device_add_escaped_name(u, "node-", udev_list_entry_get_name(item), false)) < 0)
+ if ((r = device_add_escaped_name(u, udev_list_entry_get_name(item), false)) < 0)
goto fail;
if (names) {
device_set_state(DEVICE(u), DEVICE_AVAILABLE);
}
+ unit_add_to_dbus_queue(u);
+
return 0;
fail:
return -ENOMEM;
assert(sysfs[0] == '/');
- if (!(e = unit_name_escape_path("sysfs-", sysfs+1, ".device")))
+ if (!(e = unit_name_escape_path(sysfs+1, ".device")))
return -ENOMEM;
u = manager_get_unit(m, e);