chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1ebf0cb
)
udev: path_id - add cciss support
author
Hannes Reinecke
<hare@suse.de>
Thu, 10 May 2012 11:18:07 +0000
(13:18 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Thu, 10 May 2012 12:03:49 +0000
(14:03 +0200)
src/udev/udev-builtin-path_id.c
patch
|
blob
|
history
diff --git
a/src/udev/udev-builtin-path_id.c
b/src/udev/udev-builtin-path_id.c
index 0a1cd3b85ab84325e2594df1fbe003415e5a3c01..1a093d9d92faa84262c99eb6d53c8f47072025d6 100644
(file)
--- a/
src/udev/udev-builtin-path_id.c
+++ b/
src/udev/udev-builtin-path_id.c
@@
-340,6
+340,20
@@
out:
return parent;
}
return parent;
}
+static struct udev_device *handle_cciss(struct udev_device *parent, char **path)
+{
+ const char *str;
+ unsigned int controller, disk;
+
+ str = udev_device_get_sysname(parent);
+ if (sscanf(str, "c%ud%u%*s", &controller, &disk) != 2)
+ return NULL;
+
+ path_prepend(path, "cciss-disk%u", disk);
+ parent = skip_subsystem(parent, "cciss");
+ return parent;
+}
+
static void handle_scsi_tape(struct udev_device *dev, char **path)
{
const char *name;
static void handle_scsi_tape(struct udev_device *dev, char **path)
{
const char *name;
@@
-429,6
+443,8
@@
static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
} else if (strcmp(subsys, "scsi") == 0) {
parent = handle_scsi(parent, &path);
some_transport = true;
} else if (strcmp(subsys, "scsi") == 0) {
parent = handle_scsi(parent, &path);
some_transport = true;
+ } else if (strcmp(subsys, "cciss") == 0) {
+ parent = handle_cciss(parent, &path);
} else if (strcmp(subsys, "usb") == 0) {
parent = handle_usb(parent, &path);
some_transport = true;
} else if (strcmp(subsys, "usb") == 0) {
parent = handle_usb(parent, &path);
some_transport = true;