From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 14 Dec 2010 01:30:36 +0000 (+0100)
Subject: udevd: write full database file for (unsupported) renamed device nodes
X-Git-Tag: 174~285
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=14996e80d4b002dbbef9721b936fe29155375fb1;ds=sidebyside

udevd: write full database file for (unsupported) renamed device nodes
---

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 430e3e64d..406d8704f 100644
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -89,6 +89,9 @@ static bool device_has_info(struct udev_device *udev_device)
 			return true;
 	if (udev_device_get_tags_list_entry(udev_device) != NULL)
 		return true;
+	if (udev_device_get_knodename(udev_device) != NULL)
+		if (strcmp(udev_device_get_devnode(udev_device), udev_device_get_knodename(udev_device)) != 0)
+			return true;
 	if (udev_device_get_watch_handle(udev_device) >= 0)
 		return true;
 	return false;
@@ -102,7 +105,6 @@ int udev_device_update_db(struct udev_device *udev_device)
 	char filename[UTIL_PATH_SIZE];
 	char filename_tmp[UTIL_PATH_SIZE];
 	FILE *f;
-	size_t devlen = strlen(udev_get_dev_path(udev))+1;
 
 	id = udev_device_get_id_filename(udev_device);
 	if (id == NULL)
@@ -127,6 +129,7 @@ int udev_device_update_db(struct udev_device *udev_device)
 	}
 
 	if (has_info) {
+		size_t devlen = strlen(udev_get_dev_path(udev))+1;
 		struct udev_list_entry *list_entry;
 
 		if (udev_device_get_devnode(udev_device) != NULL) {
diff --git a/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1/uevent b/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1/uevent
index d3e19784f..c70ff22ad 100644
--- a/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1/uevent
+++ b/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1/uevent
@@ -1,3 +1,4 @@
 MAJOR=8
 MINOR=1
 DEVTYPE=partition
+DEVNAME=sda1
diff --git a/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent b/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent
index c3945d4e0..af0df2f29 100644
--- a/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent
+++ b/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent
@@ -1,3 +1,4 @@
 MAJOR=8
 MINOR=0
 DEVTYPE=disk
+DEVNAME=sda