SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip rule, if too may keys of the same type are used

Browse Source
This commit is contained in:
Kay Sievers
2006-08-20 18:15:29 +02:00
parent 95776dc6ec
commit 38895e573c
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/udev-test.pl
+1 -1
View File
@@ -79,7 +79,7 @@ EOF
devpath => "/block/sda/sda1",
exp_name => "boot_disk1" ,
rules => <<EOF
BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="2", SYSFS{queue_depth}=="32", NAME="boot_diskXX%n"
BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="0", SYSFS{queue_depth}=="32", NAME="boot_diskXX%n"
BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="0", NAME="boot_disk%n"
EOF
},
udev_rules_parse.c
+11 -8
View File
@@ -329,10 +329,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
}
attr = get_key_attribute(key + sizeof("ATTR")-1);
if (attr == NULL) {
err("error parsing ATTR attribute in '%s'", line);
continue;
err("error parsing ATTR attribute");
goto invalid;
}
add_rule_key_pair(rule, &rule->attr, operation, attr, value);
if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
goto invalid;
valid = 1;
continue;
}
@@ -381,10 +382,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
}
attr = get_key_attribute(key + sizeof("ATTRS")-1);
if (attr == NULL) {
err("error parsing ATTRS attribute in '%s'", line);
continue;
err("error parsing ATTRS attribute");
goto invalid;
}
add_rule_key_pair(rule, &rule->attrs, operation, attr, value);
if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
goto invalid;
valid = 1;
continue;
}
@@ -393,9 +395,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
attr = get_key_attribute(key + sizeof("ENV")-1);
if (attr == NULL) {
err("error parsing ENV attribute");
continue;
goto invalid;
}
add_rule_key_pair(rule, &rule->env, operation, attr, value);
if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
goto invalid;
valid = 1;
continue;
}