From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Mon, 28 Mar 2005 09:22:17 +0000 (+0200)
Subject: [PATCH] read %s{}-sysfs values at any device in the chain
X-Git-Tag: 057~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98bbc835f584ed6792e895519326cc637f64f411;p=systemd

[PATCH] read %s{}-sysfs values at any device in the chain
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5d7c5e5b..ed94629d 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1222,6 +1222,15 @@ EOF
 		exp_name	=> "sane",
 		rules		=> <<EOF
 BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e name; (/sbin/badprogram)", RESULT="name_ _/sbin/badprogram_", NAME="sane"
+EOF
+	},
+	{
+		desc		=> "read sysfs value from device down in the chain",
+		subsys		=> "block",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "serial-0000:00:09.0",
+		rules		=> <<EOF
+KERNEL=="ttyUSB*", NAME="serial-%s{serial}"
 EOF
 	},
 );
diff --git a/udev_rules.c b/udev_rules.c
index 2fca33d0..00199a06 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -287,8 +287,18 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 				break;
 			}
 			if (find_sysfs_attribute(class_dev, sysfs_device, attr, temp2, sizeof(temp2)) != 0) {
-				dbg("sysfs attribute '%s' not found", attr);
-				break;
+				struct sysfs_device *parent_device;
+
+				dbg("sysfs attribute '%s' not found, walk up the physical devices", attr);
+				parent_device = sysfs_get_device_parent(sysfs_device);
+				while (parent_device) {
+					dbg("looking at '%s'", parent_device->path);
+					if (find_sysfs_attribute(NULL, parent_device, attr, temp2, sizeof(temp2)) == 0)
+						break;
+					parent_device = sysfs_get_device_parent(parent_device);
+				}
+				if (!parent_device)
+					break;
 			}
 			/* strip trailing whitespace of sysfs value */
 			i = strlen(temp2);