mirror of
https://github.com/systemd/systemd
synced 2024-10-07 00:30:59 +00:00
[PATCH] got REPLACE to work properly.
This commit is contained in:
parent
cb32ac946f
commit
c18d70b447
39
namedev.c
39
namedev.c
|
@ -419,18 +419,45 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
|
||||||
{
|
{
|
||||||
struct list_head *tmp;
|
struct list_head *tmp;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
int found;
|
||||||
|
|
||||||
list_for_each(tmp, &config_device_list) {
|
list_for_each(tmp, &config_device_list) {
|
||||||
struct config_device *dev = list_entry(tmp, struct config_device, node);
|
struct config_device *dev = list_entry(tmp, struct config_device, node);
|
||||||
if (strcmp(dev->attr.name, class_dev->name) == 0) {
|
switch (dev->type) {
|
||||||
|
case LABEL:
|
||||||
|
dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
|
||||||
|
" owner = '%s', group = '%s', mode = '%#o'",
|
||||||
|
dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
|
||||||
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
|
break;
|
||||||
|
case NUMBER:
|
||||||
|
dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
|
||||||
|
" owner = '%s', group = '%s', mode = '%#o'",
|
||||||
|
dev->attr.name, dev->bus, dev->id,
|
||||||
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
|
break;
|
||||||
|
case TOPOLOGY:
|
||||||
|
dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
|
||||||
|
" owner = '%s', group = '%s', mode = '%#o'",
|
||||||
|
dev->attr.name, dev->bus, dev->place,
|
||||||
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
|
break;
|
||||||
|
case REPLACE:
|
||||||
|
if (strcmp(dev->kernel_name, class_dev->name) != 0)
|
||||||
|
continue;
|
||||||
|
strcpy(attr->name, dev->attr.name);
|
||||||
attr->mode = dev->attr.mode;
|
attr->mode = dev->attr.mode;
|
||||||
strcpy(attr->owner, dev->attr.owner);
|
strcpy(attr->owner, dev->attr.owner);
|
||||||
strcpy(attr->group, dev->attr.group);
|
strcpy(attr->group, dev->attr.group);
|
||||||
/* FIXME put the proper name here!!! */
|
dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
|
||||||
strcpy(attr->name, dev->attr.name);
|
dev->kernel_name, attr->name,
|
||||||
dbg("%s - owner = %s, group = %s, mode = %#o", dev->attr.name, dev->attr.owner, dev->attr.group, dev->attr.mode);
|
dev->attr.owner, dev->attr.group, dev->attr.mode);
|
||||||
goto exit;
|
return retval;
|
||||||
}
|
break;
|
||||||
|
default:
|
||||||
|
dbg("Unknown type of device!");
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
attr->mode = get_default_mode(class_dev);
|
attr->mode = get_default_mode(class_dev);
|
||||||
attr->owner[0] = 0x00;
|
attr->owner[0] = 0x00;
|
||||||
|
|
|
@ -18,4 +18,5 @@ TOPOLOGY, BUS="usb", place="2.2", NAME="mouse1"
|
||||||
|
|
||||||
# ttyUSB1 should always be called visor
|
# ttyUSB1 should always be called visor
|
||||||
REPLACE, KERNEL="ttyUSB1", NAME="visor"
|
REPLACE, KERNEL="ttyUSB1", NAME="visor"
|
||||||
|
REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue