diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-10-28 16:50:24 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-10-28 16:51:36 +0100 |
| commit | cc821d02a37c8c76aaf15bae2d33fee1bdc4b2e0 (patch) | |
| tree | fd59257bf2902c506044fc06b095fa94a3a3c167 | |
| parent | f6d1de8547b1e957773f8b6764420579c8378aaf (diff) | |
| download | systemd-cc821d02a37c8c76aaf15bae2d33fee1bdc4b2e0.tar.gz | |
udev: path_id - set supported_parent for well-known SCSI setups
| -rw-r--r-- | src/udev/udev-builtin-path_id.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index 073f05aac3..0d247f6b5a 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -332,7 +332,7 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char * return parent; } -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; const char *id; @@ -346,6 +346,7 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path) if (id != NULL) { parent = skip_subsystem(parent, "scsi"); path_prepend(path, "ieee1394-0x%s", id); + *supported_parent = true; goto out; } @@ -354,16 +355,19 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path) 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; } @@ -502,7 +506,7 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool } 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); |