[PATCH] handle renamed network interfaces properly if we manage hotplug.d/

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index 60506b424307506e6402b2ef0ec99ab6e9fbe77f..acd678ffbaec4d76d4d450c37c067fea88ae12c7 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -38,11 +38,11 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
 
 #include "selinux.h"
 
@@ -129,7 +129,7 @@ static int create_node(struct udevice *udev)
        char *pos;
        int len;
 
-       snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+       snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
        filename[NAME_SIZE-1] = '\0';
 
        switch (udev->type) {
@@ -189,7 +189,7 @@ static int create_node(struct udevice *udev)
        } else {
                info("creating device node '%s', major = '%d', minor = '%d', "
                     "mode = '%#o', uid = '%d', gid = '%d'", filename,
-                    udev->major, udev->minor, (mode_t)udev->mode, uid, gid);
+                    udev->major, udev->minor, udev->mode, uid, gid);
        }
 
        /* create all_partitions if requested */
@@ -210,7 +210,7 @@ static int create_node(struct udevice *udev)
                char linktarget[NAME_SIZE];
 
                strfieldcpymax(linkname, pos, len+1);
-               snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, linkname);
+               snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
                filename[NAME_SIZE-1] = '\0';
 
                dbg("symlink '%s' to node '%s' requested", filename, udev->name);
@@ -303,12 +303,12 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                if (retval != 0)
                        goto exit;
 
-               if (udevdb_add_dev(udev) != 0)
-                       dbg("udevdb_add_dev failed, but we create the node anyway, "
+               if (udev_db_add_device(udev) != 0)
+                       dbg("udev_db_add_dev failed, but we create the node anyway, "
                            "remove might not work for custom names");
 
                /* use full path to the environment */
-               snprintf(udev->devname, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+               snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
                udev->devname[NAME_SIZE-1] = '\0';
 
        } else if (udev->type == 'n') {
@@ -318,15 +318,16 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                        if (retval != 0)
                                goto exit;
 
-                       /* we've changed the name, now fake the devpath,
-                        * cause original kernel name sleeps with the fishes
-                        * and we don't get any event from the kernel now
+                       /* we've changed the name, now fake the devpath, cause the
+                        * original kernel name sleeps with the fishes and we don't
+                        * get an event from the kernel with the new name
                         */
                        pos = strrchr(udev->devpath, '/');
                        if (pos != NULL) {
                                pos[1] = '\0';
                                strfieldcat(udev->devpath, udev->name);
                                setenv("DEVPATH", udev->devpath, 1);
+                               setenv("INTERFACE", udev->name, 1);
                        }
 
                        /* use netif name for the environment */