[PATCH] Fix gentoo bug #76056 (fb device group permissions.)

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 26c68fadf6ed9487ff576fb2bf962634cba398a5..332e2d57d80f9a773ef0579ce2eb8f0c723c0dad 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -201,6 +201,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 
 
                switch (c) {
+               case 'p':
+                       if (strlen(udev->devpath) == 0)
+                               break;
+                       strfieldcatmax(string, udev->devpath, maxsize);
+                       dbg("substitute kernel name '%s'", udev->kernel_name);
+                       break;
                case 'b':
                        if (strlen(udev->bus_id) == 0)
                                break;
@@ -290,6 +296,15 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                strfieldcatmax(string, temp2, maxsize);
                        }
                        break;
+               case 'N':
+                       if (udev->tmp_node[0] == '\0') {
+                               dbg("create temporary device node for callout");
+                               snprintf(udev->tmp_node, NAME_SIZE-1, "%s/.tmp-%u-%u", udev_root, udev->major, udev->minor);
+                               udev_make_node(udev, udev->tmp_node, udev->major, udev->minor, 0600, 0, 0);
+                       }
+                       strfieldcatmax(string, udev->tmp_node, maxsize);
+                       dbg("substitute temporary device node name '%s'", udev->tmp_node);
+                       break;
                default:
                        dbg("unknown substitution type '%%%c'", c);
                        break;
@@ -670,7 +685,6 @@ try_parent:
                dbg("sysfs_device->path='%s'", sysfs_device->path);
                dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
        }
-
 }
 
 int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
@@ -716,32 +730,32 @@ 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) {
-                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-                               /* 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);
-                               }
+                       /* empty name, symlink and perms will not create any node */
+                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
+                           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 */
+                       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 */
+                       /* collect symlinks for this or the final matching rule */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];
 
@@ -774,19 +788,9 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                        goto exit;
 
                                udev->partitions = dev->partitions;
-                               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);
+                               dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
+                                   udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 
                                goto exit;
                        }
@@ -798,5 +802,11 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        dbg("no rule found, use kernel name '%s'", udev->name);
 
 exit:
+       if (udev->tmp_node[0] != '\0') {
+               dbg("removing temporary device node");
+               unlink_secure(udev->tmp_node);
+               udev->tmp_node[0] = '\0';
+       }
+
        return 0;
 }