summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-12-07 22:38:40 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:06:10 -0700
commit0ba5bb106b19d808c2e68af4ff34740854f78290 (patch)
treedf96beb616a1cfa415728639937358cfac4a38d8
parente608ba5d457c8876da58e3877da21d014d4868e0 (diff)
[PATCH] restore OWNER/GROUP assignment in rule coming from RESULT
-rw-r--r--namedev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/namedev.c b/namedev.c
index 7045637e79..9cfc4283be 100644
--- a/namedev.c
+++ b/namedev.c
@@ -665,8 +665,7 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
/* check for matching result of external program */
if (dev->result[0] != '\0') {
- dbg("check for " FIELD_RESULT
- " dev->result='%s', udev->program_result='%s'",
+ dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
dev->result, udev->program_result);
if (strcmp_pattern(dev->result, udev->program_result) != 0) {
dbg(FIELD_RESULT " is not matching");
@@ -777,7 +776,9 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
udev->partitions = dev->partitions;
udev->mode = dev->mode;
strfieldcpy(udev->owner, dev->owner);
+ apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
strfieldcpy(udev->group, dev->group);
+ apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
goto perms;
}