X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=2081e503c7d33d8eb5f0cee4cbd0f09684665ef3;hp=d0d9eab913b21c4d00671e480d602dc1cadea0f6;hb=e5b7f7b83428cb50f165b49408c2f7559dcfefef;hpb=6b493a20e1dbf90a4e54d3be37027fa906220c31

diff --git a/udev_add.c b/udev_add.c
index d0d9eab91..2081e503c 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -182,7 +182,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 +221,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,19 +268,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;
-		}
-	}
-
-	if (udev_rules_get_name(udev, class_dev) != 0)
-		return 0;
-
 	dbg("adding name='%s'", udev->name);
-
 	selinux_init();
 
 	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
@@ -322,6 +310,5 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 
 exit:
 	selinux_exit();
-
 	return retval;
 }