chiark / gitweb /
[PATCH] pattern match for label method
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Fri, 5 Dec 2003 03:21:31 +0000 (19:21 -0800)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 04:13:06 +0000 (21:13 -0700)
  switch LABEL search to pattern match
  add a test for pattern match in LABEL
  remove useless rule from udev.rules

namedev.c
test/udev-test.pl
udev.rules

index ea75bc5..1faa253 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -412,7 +412,7 @@ label_found:
                        *c = 0x00;
                dbg("compare attribute '%s' value '%s' with '%s'",
                          dev->sysfs_file, tmpattr->value, dev->sysfs_value);
-               if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+               if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
                        continue;
 
                strfieldcpy(udev->name, dev->name);
index 97f75ed..b1757ee 100644 (file)
@@ -52,6 +52,18 @@ LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
 EOF
        },
        {
+               desc     => "label test of pattern match",
+               subsys   => "block",
+               devpath  => "block/sda/sda1",
+               expected => "boot_disk1" ,
+               conf     => <<EOF
+LABEL, BUS="scsi", vendor="?IBM-ESXS", NAME="boot_disk%n-1"
+LABEL, BUS="scsi", vendor="IBM-ESXS?", NAME="boot_disk%n-2"
+LABEL, BUS="scsi", vendor="IBM-ES??", NAME="boot_disk%n"
+LABEL, BUS="scsi", vendor="IBM-ESXSS", NAME="boot_disk%n-3"
+EOF
+       },
+       {
                desc     => "catch device by *",
                subsys   => "tty",
                devpath  => "class/tty/ttyUSB0",
index 44fdb25..3044a87 100644 (file)
@@ -42,7 +42,6 @@ REPLACE, KERNEL="ttyUSB1", NAME="visor"
 REPLACE, KERNEL="ttyUSB0", NAME="pl2303"
 
 # a devfs like way to name some tty devices
-#REPLACE, KERNEL="tty", NAME="tty"
 #REPLACE, KERNEL="ttyS*", NAME="tts/%n"
 #REPLACE, KERNEL="tty*", NAME="vc/%n"