tmpfiles: also look in /lib/tmpfiles.d on split /usr systems

[elogind.git] / src / udev / udev-builtin-path_id.c

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 0a1cd3b85ab84325e2594df1fbe003415e5a3c01..8eac991d3c2f6784c1e688e8d6c78cca34f2b22b 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;
 }
 
+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;
@@ -429,6 +443,9 @@ 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, "cciss") == 0) {
+                        parent = handle_cciss(parent, &path);
+                        some_transport = true;
                 } else if (strcmp(subsys, "usb") == 0) {
                         parent = handle_usb(parent, &path);
                         some_transport = true;
@@ -441,6 +458,7 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                 } else if (strcmp(subsys, "platform") == 0) {
                         path_prepend(&path, "platform-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "platform");
+                        some_transport = true;
                 } else if (strcmp(subsys, "acpi") == 0) {
                         path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "acpi");