diff options
| -rwxr-xr-x | test/udev-test.pl | 22 | ||||
| -rw-r--r-- | udev.h | 4 |
2 files changed, 3 insertions, 23 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl index 36cbe8ac75..10d87ed54a 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -302,7 +302,7 @@ EOF devpath => "/block/sda", exp_name => "node12345678", rules => <<EOF -SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678 \\n TEST_key2=98765 \'", NAME="node\$env{TEST_KEY}" +SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678\\n TEST_key2=98765\'", NAME="node\$env{TEST_KEY}" KERNEL=="ttyUSB0", NAME="visor" EOF }, @@ -1018,26 +1018,6 @@ KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%3s{dev}" EOF }, { - desc => "symlink with '%' in name", - subsys => "tty", - devpath => "/class/tty/ttyUSB0", - exp_name => "percent%sign", - exp_target => "ttyUSB0", - rules => <<EOF -KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="percent%%sign" -EOF - }, - { - desc => "symlink with '%' in name", - subsys => "tty", - devpath => "/class/tty/ttyUSB0", - exp_name => "%ttyUSB0_name", - exp_target => "ttyUSB0", - rules => <<EOF -KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%%%k_name" -EOF - }, - { desc => "program result substitution (numbered part of)", subsys => "block", devpath => "/block/sda/sda3", @@ -34,9 +34,9 @@ #define NAME_SIZE 256 #define VALUE_SIZE 128 -#define ALLOWED_CHARS "#+-.:=@_%" +#define ALLOWED_CHARS "#+-.:=@_" #define ALLOWED_CHARS_FILE ALLOWED_CHARS "/" -#define ALLOWED_CHARS_INPUT ALLOWED_CHARS " $/?," +#define ALLOWED_CHARS_INPUT ALLOWED_CHARS_FILE " $%?," #define DEFAULT_PARTITIONS_COUNT 15 #define UDEV_ALARM_TIMEOUT 180 |