]> err.no Git - systemd/commitdiff
[PATCH] restore OWNER/GROUP assignment in rule coming from RESULT
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Tue, 7 Dec 2004 21:38:40 +0000 (22:38 +0100)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 06:06:10 +0000 (23:06 -0700)
namedev.c

index 7045637e79e5f3423d6a4bd005dfd0b23ee513b9..9cfc4283be12b8b4d57df85695ea308d1b1c2818 100644 (file)
--- 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;
                        }