X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=6f10b1e58d1318c998f7151caffc43c8d16b33bf;hp=afbd50e50fc00fdfb9fa1948a209f0d8ec2893b4;hb=422d5becc339304805bbe1e359f6389633036a98;hpb=8a4c0c32f4252efb0f0adbf5cdc0261d359cd568

diff --git a/udev_db.c b/udev_db.c
index afbd50e50..6f10b1e58 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -68,10 +68,18 @@ int udev_db_add_device(struct udevice *udev)
 	if (udev->test_run)
 		return 0;
 
-	get_db_filename(udev->devpath, filename, sizeof(filename));
+	/* don't write anything if udev created only the node with the
+	 * kernel name without any interesting data to remember
+	 */
+	if (strcmp(udev->name, udev->kernel_name) == 0 &&
+	    list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
+	    !udev->partitions && !udev->ignore_remove) {
+		dbg("nothing interesting to store in udevdb, skip");
+		goto exit;
+	}
 
+	get_db_filename(udev->devpath, filename, sizeof(filename));
 	create_path(filename);
-
 	f = fopen(filename, "w");
 	if (f == NULL) {
 		err("unable to create db file '%s'", filename);
@@ -84,11 +92,15 @@ int udev_db_add_device(struct udevice *udev)
 	list_for_each_entry(name_loop, &udev->symlink_list, node)
 		fprintf(f, "S:%s\n", name_loop->name);
 	fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-	fprintf(f, "A:%u\n", udev->partitions);
-	fprintf(f, "R:%u\n", udev->ignore_remove);
-
+	if (udev->partitions)
+		fprintf(f, "A:%u\n", udev->partitions);
+	if (udev->ignore_remove)
+		fprintf(f, "R:%u\n", udev->ignore_remove);
+	list_for_each_entry(name_loop, &udev->env_list, node)
+		fprintf(f, "E:%s\n", name_loop->name);
 	fclose(f);
 
+exit:
 	return 0;
 }
 
@@ -149,6 +161,12 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 			strlcpy(line, &bufline[2], count-1);
 			udev->ignore_remove = atoi(line);
 			break;
+		case 'E':
+			if (count > sizeof(line))
+				count =  sizeof(line);
+			strlcpy(line, &bufline[2], count-1);
+			name_list_add(&udev->env_list, line, 0);
+			break;
 		}
 	}
 	file_unmap(buf, bufsize);