X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=e9ae150180f56675bad3d1618e62833060344cd8;hp=5fff3836e3b928ded678ecbd53ea97693ef84d5f;hb=7b2bdb4b1bd9e273ea67e4538be3f7d3545331fa;hpb=821d0ec803a72841f173739f5b713fe847edab75

diff --git a/udev_add.c b/udev_add.c
index 5fff3836e..e9ae15018 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -52,12 +52,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 +80,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();
@@ -182,7 +181,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
 				snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
 				partitionname[sizeof(partitionname)-1] = '\0';
-				part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+				part_devt = makedev(major(udev->devt), minor(udev->devt) + i);
 				udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
 			}
 		}
@@ -221,7 +220,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 		dbg("symlink(%s, %s)", linktarget, filename);
 		if (!udev->test_run) {
 			unlink(filename);
-			selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
+			selinux_setfscreatecon(filename, NULL, S_IFLNK);
 			retval = symlink(linktarget, filename);
 			selinux_resetfscreatecon();
 			if (retval != 0)
@@ -268,22 +267,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 	char *pos;
 	int retval = 0;
 
-	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
-		udev->devt = get_devt(class_dev);
-		if (!udev->devt) {
-			dbg("no dev-file found, do nothing");
-			return 0;
-		}
-	}
-
-	udev_rules_get_name(udev, class_dev);
-	if (udev->ignore_device) {
-		dbg("device event will be ignored");
-		return 0;
-	}
-
 	dbg("adding name='%s'", udev->name);
-
 	selinux_init();
 
 	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
@@ -306,6 +290,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
@@ -314,6 +299,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);
 			}
@@ -325,6 +311,5 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 
 exit:
 	selinux_exit();
-
 	return retval;
 }