remove no longer needed includes

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index 2081e503c7d33d8eb5f0cee4cbd0f09684665ef3..9420b4fe14fb633c46d2c4f2b790fcc7b412f03a 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -1,10 +1,8 @@
 /*
  * udev-add.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -52,12 +50,23 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
        struct stat stats;
        int retval = 0;
 
+       switch (udev->type) {
+       case DEV_BLOCK:
+               mode |= S_IFBLK;
+               break;
+       case DEV_CLASS:
+               mode |= S_IFCHR;
+               break;
+       default:
+               dbg("unknown node type %c\n", udev->type);
+               return -EINVAL;
+       }
+
        if (stat(file, &stats) != 0)
                goto create;
 
        /* preserve node with already correct numbers, to not change the inode number */
-       if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
-           (stats.st_rdev == devt)) {
+       if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
                info("preserve file '%s', cause it has correct dev_t", file);
                selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
                goto perms;
@@ -69,18 +78,6 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
                dbg("already present file '%s' unlinked", file);
 
 create:
-       switch (udev->type) {
-       case DEV_BLOCK:
-               mode |= S_IFBLK;
-               break;
-       case DEV_CLASS:
-               mode |= S_IFCHR;
-               break;
-       default:
-               dbg("unknown node type %c\n", udev->type);
-               return -EINVAL;
-       }
-
        selinux_setfscreatecon(file, udev->kernel_name, mode);
        retval = mknod(file, mode, devt);
        selinux_resetfscreatecon();
@@ -218,7 +215,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
 
-               dbg("symlink(%s, %s)", linktarget, filename);
+               info("creating symlink '%s' to '%s'", filename, linktarget);
                if (!udev->test_run) {
                        unlink(filename);
                        selinux_setfscreatecon(filename, NULL, S_IFLNK);
@@ -291,6 +288,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                        if (retval != 0)
                                goto exit;
 
+                       info("renamed netif to '%s'", udev->name);
                        /* 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
@@ -299,6 +297,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                        if (pos != NULL) {
                                pos[1] = '\0';
                                strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
+                               strlcpy(udev->kernel_name, udev->name, sizeof(udev->kernel_name));
                                setenv("DEVPATH", udev->devpath, 1);
                                setenv("INTERFACE", udev->name, 1);
                        }