summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-08-04 18:15:34 +0200
committerKay Sievers <kay@vrfy.org>2014-08-04 18:16:23 +0200
commite98bbfd2074e2b1079b7059341eac25741baf319 (patch)
tree1c608d0629e6a5e3c1ebd9c6b5fec303381a515f
parentbd8f65387673e29f46136a4ed172097035002c23 (diff)
udev: path_id - suppress ID_PATH for devices with an unknown parent device type
https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1321816
-rw-r--r--src/udev/udev-builtin-path_id.c38
1 files changed, 27 insertions, 11 deletions
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index ac0f71f83e..073f05aac3 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -481,7 +481,8 @@ out:
static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool test) {
struct udev_device *parent;
char *path = NULL;
- bool some_transport = false;
+ bool supported_transport = false;
+ bool supported_parent = false;
/* S390 ccw bus */
parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL);
@@ -502,47 +503,62 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
handle_scsi_tape(parent, &path);
} else if (streq(subsys, "scsi")) {
parent = handle_scsi(parent, &path);
- some_transport = true;
+ supported_transport = true;
} else if (streq(subsys, "cciss")) {
parent = handle_cciss(parent, &path);
- some_transport = true;
+ supported_transport = true;
} else if (streq(subsys, "usb")) {
parent = handle_usb(parent, &path);
- some_transport = true;
+ supported_transport = true;
} else if (streq(subsys, "bcma")) {
parent = handle_bcma(parent, &path);
- some_transport = true;
+ supported_transport = true;
} else if (streq(subsys, "serio")) {
path_prepend(&path, "serio-%s", udev_device_get_sysnum(parent));
parent = skip_subsystem(parent, "serio");
} else if (streq(subsys, "pci")) {
path_prepend(&path, "pci-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "pci");
+ supported_parent = true;
} else if (streq(subsys, "platform")) {
path_prepend(&path, "platform-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "platform");
- some_transport = true;
+ supported_transport = true;
+ supported_parent = true;
} else if (streq(subsys, "acpi")) {
path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "acpi");
+ supported_parent = true;
} else if (streq(subsys, "xen")) {
path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "xen");
+ supported_parent = true;
} else if (streq(subsys, "scm")) {
path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "scm");
- some_transport = true;
+ supported_transport = true;
+ supported_parent = true;
}
parent = udev_device_get_parent(parent);
}
/*
- * Do not return a single-parent-device-only for block
- * devices, they might have entire buses behind it which
- * do not get unique IDs only by using the parent device.
+ * Do return devices with have an unknown type of parent device, they
+ * might produce conflicting IDs below multiple independent parent
+ * devices.
*/
- if (!some_transport && streq(udev_device_get_subsystem(dev), "block")) {
+ if (!supported_parent) {
+ free(path);
+ path = NULL;
+ }
+
+ /*
+ * Do not return a have-only a single-parent block devices, some
+ * have entire hidden buses behind it, and not create predictable
+ * IDs that way.
+ */
+ if (streq(udev_device_get_subsystem(dev), "block") && !supported_transport) {
free(path);
path = NULL;
}