summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarvidjaar@mail.ru <arvidjaar@mail.ru>2004-03-01 22:23:39 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:34:28 -0700
commit97ed02eebe5c0676848d0707d13f4a21b6f4232f (patch)
treef6ee4e2fefcf7113dc3d8fe937b64f51dfbbfcaf
parentf070df164c95f825ba0217a71b2d475fd4a8a29e (diff)
[PATCH] Add symlink only rules support
-rw-r--r--namedev.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/namedev.c b/namedev.c
index 581a7f2218..c9232fa2aa 100644
--- a/namedev.c
+++ b/namedev.c
@@ -816,17 +816,31 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
list_for_each_entry(dev, &config_device_list, node) {
dbg("process rule");
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
- if (dev->name[0] == '\0') {
+ if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
info("configured rule in '%s' at line %i applied, '%s' is ignored",
udev_rules_filename, dev->config_line, udev->kernel_name);
return -1;
}
- info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
- udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- goto found;
+ if (dev->symlink[0] != '\0') {
+ char temp[NAME_MAX];
+
+ info("configured rule in '%s' at line %i applied, added symlink '%s'",
+ udev_rules_filename, dev->config_line, dev->symlink);
+ /* do not clobber dev */
+ strfieldcpy(temp, dev->symlink);
+ apply_format(udev, temp, sizeof(temp),
+ class_dev, sysfs_device);
+ strfieldcat(udev->symlink, temp);
+ strfieldcat(udev->symlink, " ");
+ }
+
+ if (dev->name[0] != '\0') {
+ info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+ udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+ strfieldcpy(udev->name, dev->name);
+ goto found;
+ }
}
}
@@ -838,8 +852,6 @@ found:
/* substitute placeholder */
apply_format(udev, udev->name, sizeof(udev->name),
class_dev, sysfs_device);
- apply_format(udev, udev->symlink, sizeof(udev->symlink),
- class_dev, sysfs_device);
udev->partitions = dev->partitions;
done:
perm = find_perm(udev->name);