[PATCH] netdev - udevdb+dev.d changes

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 7305676d427644f6af545552c8cc969de7e13246..a3ae1d36b3f9786ca04d6c9abde4e97e8110c310 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -32,10 +32,14 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#ifndef __KLIBC__
+#include <sys/sysinfo.h>
+#endif
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -453,7 +457,7 @@ static int execute_program(char *path, char *value, int len)
                        retval = -1;
                }
 
-               if (i > 0 && value[i] == '\n')
+               if (i > 0 && value[i-1] == '\n')
                        i--;
                value[i] = '\0';
                dbg("result is '%s'", value);
@@ -618,8 +622,8 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
         * possibly have a whitelist for these devices here...
         */
        class_dev_parent = sysfs_get_classdev_parent(class_dev);
-       if (class_dev_parent) 
-               dbg("Really a partition");
+       if (class_dev_parent != NULL) 
+               dbg("given class device has a parent, use this instead");
 
        tspec.tv_sec = 0;
        tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
@@ -627,24 +631,21 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
        while (loop--) {
                if (udev_sleep)
                        nanosleep(&tspec, NULL);
+
                if (class_dev_parent)
                        sysfs_device = sysfs_get_classdev_device(class_dev_parent);
                else
                        sysfs_device = sysfs_get_classdev_device(class_dev);
-
                if (sysfs_device != NULL)
                        goto device_found;
        }
        dbg("timed out waiting for device symlink, continuing on anyway...");
-       
+
 device_found:
         /* We have another issue with just the wait above - the sysfs part of
         * the kernel may not be quick enough to have created the link to the
         * device under the "bus" subsystem. Due to this, the sysfs_device->bus
         * will not contain the actual bus name :(
-        *
-        * Libsysfs now provides a new API sysfs_get_device_bus(), so use it
-        * if needed
         */
         if (sysfs_device) {
                if (sysfs_device->bus[0] != '\0')
@@ -778,6 +779,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        struct sysfs_device *sysfs_device = NULL;
        struct config_device *dev;
        struct perm_device *perm;
+       struct sysinfo info;
        char *pos;
 
        udev->mode = 0;
@@ -815,19 +817,23 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                        }
 
                        if (dev->symlink[0] != '\0') {
-                               char temp[NAME_MAX];
+                               char temp[NAME_SIZE];
 
                                info("configured rule in '%s' at line %i applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
-                               /* do not clobber dev */
                                strfieldcpy(temp, dev->symlink);
-                               apply_format(udev, temp, sizeof(temp),
-                                            class_dev, sysfs_device);
+                               apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+                               if (udev->symlink[0] != '\0')
+                                       strfieldcat(udev->symlink, " ");
                                strfieldcat(udev->symlink, temp);
-                               strfieldcat(udev->symlink, " ");
                        }
 
                        if (dev->name[0] != '\0') {
+                               /* apply all_partitions flag only at a main block device */
+                               if (dev->partitions > 0 &&
+                                   (udev->type != 'b' || udev->kernel_number[0] != '\0'))
+                                       continue;
+
                                info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
                                strfieldcpy(udev->name, dev->name);
@@ -835,22 +841,29 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                        }
                }
        }
-
        /* no rule was found so we use the kernel name */
        strfieldcpy(udev->name, udev->kernel_name);
-       goto done;
+       if (udev->type == 'n')
+               goto done;
+       else
+               goto perms;
 
 found:
-       apply_format(udev, udev->name, sizeof(udev->name),
-                    class_dev, sysfs_device);
+       apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+
+       if (udev->type == 'n')
+               goto done;
+
        udev->partitions = dev->partitions;
+       strfieldcpy(udev->config_file, dev->config_file);
+       udev->config_line = dev->config_line;
 
-done:
        /* get permissions given in rule */
        set_empty_perms(udev, dev->mode,
                              dev->owner,
                              dev->group);
 
+perms:
        /* get permissions given in config file or set defaults */
        perm = find_perm(udev->name);
        if (perm != NULL) {
@@ -866,6 +879,11 @@ done:
        dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
            udev->name, udev->owner, udev->group, udev->mode);
 
+done:
+       /* store time of action */
+       sysinfo(&info);
+       udev->config_uptime = info.uptime;
+
        return 0;
 }