[systemd-commits] 2 commits - Makefile.am src/udev

[Kay Sievers]

 Makefile.am                     |    2 +-
 src/udev/udev-builtin-path_id.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c0735bb2183493147c17a509ec8038bced5d35c9
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Oct 11 22:31:23 2012 +0200

    build-sys: check - fix typo

diff --git a/Makefile.am b/Makefile.am
index e332183..1c2514d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1166,7 +1166,7 @@ TESTS += \
 	test-strv \
 	test-unit-name \
 	test-unit-file \
-	test-data
+	test-date
 
 test_engine_SOURCES = \
 	src/test/test-engine.c

commit 4ecc131848c942196fe11f46468574da5cff19f4
Author: Sebastian Ott <sebott at linux.vnet.ibm.com>
Date:   Tue Oct 9 15:57:54 2012 +0200

    udev: path_id - add scm support
    
    Add support for scm block devices. Introduced here:
    http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=f30664e2
    
    Signed-off-by: Sebastian Ott <sebott at linux.vnet.ibm.com>

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 720f616..6a78a47 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -484,6 +484,9 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                 } else if (strcmp(subsys, "virtio") == 0) {
                         path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "virtio");
+                } else if (strcmp(subsys, "scm") == 0) {
+                        path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
+                        parent = skip_subsystem(parent, "scm");
                 }
 
                 parent = udev_device_get_parent(parent);