diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2003-12-04 19:21:31 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:13:06 -0700 |
| commit | 83be97ba211c4f69e7fd9f16f57ca7210a116a7d (patch) | |
| tree | 252b685f9c616025d04b5981c66dda9e1e1187c1 | |
| parent | 28d6536a0fff341bb3e307ad1abc30df57635f30 (diff) | |
| download | systemd-83be97ba211c4f69e7fd9f16f57ca7210a116a7d.tar.gz | |
[PATCH] pattern match for label method
switch LABEL search to pattern match
add a test for pattern match in LABEL
remove useless rule from udev.rules
| -rw-r--r-- | namedev.c | 2 | ||||
| -rw-r--r-- | test/udev-test.pl | 12 | ||||
| -rw-r--r-- | udev.rules | 1 |
3 files changed, 13 insertions, 2 deletions
@@ -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); diff --git a/test/udev-test.pl b/test/udev-test.pl index 97f75edc94..b1757ee1bb 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -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", diff --git a/udev.rules b/udev.rules index 44fdb2561d..3044a87b44 100644 --- a/udev.rules +++ b/udev.rules @@ -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" |