[PATCH] udevd: it's obviously not the brightest idea to exit a device node manager...

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index be7ae12cd599513dd7615fa657f7d586b8846aa2..26c68fadf6ed9487ff576fb2bf962634cba398a5 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -680,7 +680,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        struct config_device *dev;
        char *pos;
 
-       udev->mode = 0;
        dbg("class_dev->name='%s'", class_dev->name);
 
        /* Figure out where the "device"-symlink is at.  For char devices this will
@@ -717,18 +716,36 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
                if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
-                       /* empty name and symlink will not create any node */
                        if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-                               info("configured rule in '%s' at line %i applied, '%s' is ignored",
-                                    dev->config_file, dev->config_line, udev->kernel_name);
-                               return -1;
+                               /* empty name, symlink, perms will not create any node */
+                               if (dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0') {
+                                       info("configured rule in '%s[%i]' applied, '%s' is ignored",
+                                            dev->config_file, dev->config_line, udev->kernel_name);
+                                       return -1;
+                               }
+
+                               /* apply permissions only rule values */
+                               if (dev->mode != 0000) {
+                                       udev->mode = dev->mode;
+                                       dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+                               }
+                               if (dev->owner[0] != '\0') {
+                                       strfieldcpy(udev->owner, dev->owner);
+                                       apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+                                       dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+                               }
+                               if (dev->group[0] != '\0') {
+                                       strfieldcpy(udev->group, dev->group);
+                                       apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+                                       dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+                               }
                        }
 
                        /* collect symlinks for the final matching rule */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];
 
-                               info("configured rule in '%s' at line %i applied, added symlink '%s'",
+                               info("configured rule in '%s[%i]' applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
                                strfieldcpy(temp, dev->symlink);
                                apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
@@ -744,7 +761,7 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                    (udev->type != 'b' || udev->kernel_number[0] != '\0'))
                                        continue;
 
-                               info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+                               info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
 
                                strfieldcpy(udev->name, dev->name);
@@ -757,34 +774,28 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                        goto exit;
 
                                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);
+                               if (dev->mode != 0000)
+                                       udev->mode = dev->mode;
+                               if (dev->owner[0] != '\0') {
+                                       strfieldcpy(udev->owner, dev->owner);
+                                       apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+                               }
+                               if (dev->group[0] != '\0') {
+                                       strfieldcpy(udev->group, dev->group);
+                                       apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+                               }
+
+                               dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+                                   udev->name, udev->owner, udev->group, udev->mode);
 
-                               goto perms;
+                               goto exit;
                        }
                }
        }
 
        /* no rule matched, so we use the kernel name */
        strfieldcpy(udev->name, udev->kernel_name);
-
-       if (udev->type == 'n')
-               goto exit;
-
-perms:
-       /* apply default permissions to empty fields */
-       if (udev->mode == 0000)
-               udev->mode = default_mode;
-       if (udev->owner[0] == '\0')
-               strfieldcpy(udev->owner, default_owner);
-       if (udev->group[0] == '\0')
-               strfieldcpy(udev->group, default_group);
-
-       dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
-           udev->name, udev->owner, udev->group, udev->mode);
+       dbg("no rule found, use kernel name '%s'", udev->name);
 
 exit:
        return 0;