X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=be62e130ab4cc33bf2f2bd111bbc4681a21ced3d;hp=a495902ab2a4154c3b073ed03e21a9f595ff5bc3;hb=6a24dc747788b6049ef35607ff252e3965af2ce5;hpb=c1ab046124ebef3c82950b91ccfd1678d9f7fe5b

diff --git a/udev_add.c b/udev_add.c
index a495902ab..be62e130a 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -89,6 +89,22 @@ int udev_make_node(struct udevice *udev, const char *file, int major, int minor,
 		dbg("already present file '%s' unlinked", file);
 
 create:
+	switch (udev->type) {
+	case 'b':
+		mode |= S_IFBLK;
+		break;
+	case 'c':
+	case 'u':
+		mode |= S_IFCHR;
+		break;
+	case 'p':
+		mode |= S_IFIFO;
+		break;
+	default:
+		dbg("unknown node type %c\n", udev->type);
+		return -EINVAL;
+	}
+
 	selinux_setfscreatecon(file, udev->kernel_name, mode);
 	retval = mknod(file, mode, makedev(major, minor));
 	if (retval != 0) {
@@ -117,43 +133,28 @@ exit:
 	return retval;
 }
 
-static int create_node(struct udevice *udev)
+static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
 	char filename[NAME_SIZE];
 	char partitionname[NAME_SIZE];
 	uid_t uid = 0;
 	gid_t gid = 0;
-	int i;
 	int tail;
 	char *pos;
 	int len;
+		int i;
 
 	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
 	filename[NAME_SIZE-1] = '\0';
 
-	switch (udev->type) {
-	case 'b':
-		udev->mode |= S_IFBLK;
-		break;
-	case 'c':
-	case 'u':
-		udev->mode |= S_IFCHR;
-		break;
-	case 'p':
-		udev->mode |= S_IFIFO;
-		break;
-	default:
-		dbg("unknown node type %c\n", udev->type);
-		return -EINVAL;
-	}
-
 	/* create parent directories if needed */
-	if (strrchr(udev->name, '/'))
+	if (strchr(udev->name, '/'))
 		create_path(filename);
 
 	if (udev->owner[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(udev->owner, &endptr, 10);
+
 		if (endptr[0] == '\0')
 			uid = (uid_t) id;
 		else {
@@ -170,6 +171,7 @@ static int create_node(struct udevice *udev)
 	if (udev->group[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(udev->group, &endptr, 10);
+
 		if (endptr[0] == '\0')
 			gid = (gid_t) id;
 		else {
@@ -193,6 +195,16 @@ static int create_node(struct udevice *udev)
 
 	/* create all_partitions if requested */
 	if (udev->partitions > 0) {
+		struct sysfs_attribute *attr;
+		int range;
+
+		/* take the maximum registered minor range */
+		attr = sysfs_get_classdev_attr(class_dev, "range");
+		if (attr) {
+			range = atoi(attr->value);
+			if (range > 1)
+				udev->partitions = range-1;
+		}
 		info("creating device partition nodes '%s[1-%i]'", filename, udev->partitions);
 		if (!udev->test_run) {
 			for (i = 1; i <= udev->partitions; i++) {
@@ -298,7 +310,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 	selinux_init();
 
 	if (udev->type == 'b' || udev->type == 'c') {
-		retval = create_node(udev);
+		retval = create_node(udev, class_dev);
 		if (retval != 0)
 			goto exit;