picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add link_priority to rule options, and store it in database

Browse source
This commit is contained in:
Kay Sievers 2007-03-16 15:16:08 +01:00
parent fc6da921ad
commit 2dbb47f860
5 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
udev.h
View file

@ -86,6 +86,7 @@ struct udevice {
int ignore_device;
int ignore_remove;
char program_result[PATH_SIZE];
int link_priority;
int test_run;
};

9
udev_db.c
View file

@ -118,6 +118,8 @@ int udev_db_add_device(struct udevice *udev)
name_index(udev->dev->devpath, name_loop->name, 1);
}
fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
if (udev->link_priority)
fprintf(f, "L:%u\n", udev->link_priority);
if (udev->partitions)
fprintf(f, "A:%u\n", udev->partitions);
if (udev->ignore_remove)
@ -198,6 +200,13 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
line[count-2] = '\0';
name_list_add(&udev->symlink_list, line, 0);
break;
case 'L':
if (count > sizeof(line))
count = sizeof(line);
memcpy(line, &bufline[2], count-2);
line[count-2] = '\0';
udev->link_priority = atoi(line);
break;
case 'A':
if (count > sizeof(line))
count = sizeof(line);

4
udev_rules.c
View file

@ -909,6 +909,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
udev->ignore_remove = 1;
dbg("remove event should be ignored");
}
if (rule->link_priority) {
udev->link_priority = rule->link_priority;
info("link_priority=%i", udev->link_priority);
}
/* apply all_partitions option only at a main block device */
if (rule->partitions &&
strcmp(udev->dev->subsystem, "block") == 0 && udev->dev->kernel_number[0] == '\0') {

1
udev_rules.h
View file

@ -87,6 +87,7 @@ struct udev_rule {
mode_t mode;
enum key_operation mode_operation;
unsigned int link_priority;
unsigned int partitions;
unsigned int last_rule:1,
ignore_device:1,

7
udev_rules_parse.c
View file

@ -555,6 +555,8 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
}
if (strcasecmp(key, "OPTIONS") == 0) {
const char *pos;
if (strstr(value, "last_rule") != NULL) {
dbg("last rule to be applied");
rule->last_rule = 1;
@ -567,6 +569,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
dbg("remove event should be ignored");
rule->ignore_remove = 1;
}
pos = strstr(value, "link_priority=");
if (pos != NULL) {
rule->link_priority = atoi(&pos[strlen("link_priority=")]);
info("link priority=%i", rule->link_priority);
}
if (strstr(value, "all_partitions") != NULL) {
dbg("creation of partition nodes requested");
rule->partitions = DEFAULT_PARTITIONS_COUNT;