59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
|
Based on cc821d02a37c8c76aaf15bae2d33fee1bdc4b2e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kay Sievers <kay@vrfy.org>
|
||
|
|
Date: Tue, 28 Oct 2014 16:50:24 +0100
|
||
|
|
Subject: [PATCH] udev: path_id - set supported_parent for well-known SCSI
|
||
|
|
setups
|
||
|
|
|
||
|
|
---
|
||
|
|
src/udev/udev-builtin-path_id.c | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- src/udev/udev-builtin-path_id.c
|
||
|
|
+++ src/udev/udev-builtin-path_id.c 2014-11-03 14:12:48.129956655 +0000
|
||
|
|
@@ -379,7 +379,7 @@ out:
|
||
|
|
return hostdev;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
|
||
|
|
+static struct udev_device *handle_scsi(struct udev_device *parent, char **path, bool *supported_parent)
|
||
|
|
{
|
||
|
|
const char *devtype;
|
||
|
|
const char *name;
|
||
|
|
@@ -394,6 +394,7 @@ static struct udev_device *handle_scsi(s
|
||
|
|
if (id != NULL) {
|
||
|
|
parent = skip_subsystem(parent, "scsi");
|
||
|
|
path_prepend(path, "ieee1394-0x%s", id);
|
||
|
|
+ *supported_parent = true;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -402,16 +403,19 @@ static struct udev_device *handle_scsi(s
|
||
|
|
|
||
|
|
if (strstr(name, "/rport-") != NULL) {
|
||
|
|
parent = handle_scsi_fibre_channel(parent, path);
|
||
|
|
+ *supported_parent = true;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (strstr(name, "/end_device-") != NULL) {
|
||
|
|
parent = handle_scsi_sas(parent, path);
|
||
|
|
+ *supported_parent = true;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (strstr(name, "/session") != NULL) {
|
||
|
|
parent = handle_scsi_iscsi(parent, path);
|
||
|
|
+ *supported_parent = true;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -545,7 +549,7 @@ static int builtin_path_id(struct udev_d
|
||
|
|
} else if (streq(subsys, "scsi_tape")) {
|
||
|
|
handle_scsi_tape(parent, &path);
|
||
|
|
} else if (streq(subsys, "scsi")) {
|
||
|
|
- parent = handle_scsi(parent, &path);
|
||
|
|
+ parent = handle_scsi(parent, &path, &supported_parent);
|
||
|
|
supported_transport = true;
|
||
|
|
} else if (streq(subsys, "cciss")) {
|
||
|
|
parent = handle_cciss(parent, &path);
|