X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=b7cdbf3402943126947af6e6d027766a6700461f;hb=9379b7c16dd3b2f11d9e69c063706037ae001a0a;hp=32b45e9baca6c039932b4b875b4b03b15425d9a7;hpb=5375c80eba10d8813a123429b655942fd7073209;p=elogind.git diff --git a/udev/udev-event.c b/udev/udev-event.c index 32b45e9ba..b7cdbf340 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -421,14 +421,9 @@ found: dbg(event->udev, "missing attribute\n"); break; } else { - struct udev_list_entry *list_entry; const char *value; - list_entry = udev_device_get_properties_list_entry(event->dev); - list_entry = udev_list_entry_get_by_name(list_entry, attr); - if (list_entry == NULL) - break; - value = udev_list_entry_get_value(list_entry); + value = udev_device_get_property_value(event->dev, attr); if (value == NULL) break; dbg(event->udev, "substitute env '%s=%s'\n", attr, value); @@ -477,8 +472,6 @@ static int rename_netif(struct udev_event *event) info(event->udev, "changing net interface name from '%s' to '%s'\n", udev_device_get_sysname(dev), event->name); - if (event->test) - return 0; sk = socket(PF_INET, SOCK_DGRAM, 0); if (sk < 0) { @@ -512,10 +505,10 @@ static int rename_netif(struct udev_event *event) goto exit; } - /* wait 30 seconds for our target to become available */ + /* wait 90 seconds for our target to become available */ util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); - util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ); - loop = 30 * 20; + util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ); + loop = 90 * 20; while (loop--) { err = ioctl(sk, SIOCSIFNAME, &ifr); if (err == 0) { @@ -529,7 +522,7 @@ static int rename_netif(struct udev_event *event) break; } dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n", - udev_device_get_devnode(dev), (30 * 20) - loop); + event->name, (90 * 20) - loop); usleep(1000 * 1000 / 20); } } @@ -557,6 +550,16 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev)); + /* read old database entry */ + dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev)); + if (dev_old != NULL) { + udev_device_read_db(dev_old); + udev_device_set_info_loaded(dev_old); + + /* disable watch during event processing */ + udev_watch_end(event->udev, dev_old); + } + udev_rules_apply_to_event(rules, event); if (event->tmp_node != NULL) { dbg(event->udev, "removing temporary device node\n"); @@ -567,21 +570,33 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) if (event->ignore_device) { info(event->udev, "device event will be ignored\n"); - goto exit; + goto exit_add; } if (event->name != NULL && event->name[0] == '\0') { info(event->udev, "device node creation supressed\n"); - goto exit; + goto exit_add; } if (event->name == NULL) { - info(event->udev, "no node name set, will use kernel name '%s'\n", + const char *devname; + + devname = udev_device_get_property_value(event->dev, "DEVNAME"); + if (devname != NULL) { + info(event->udev, "no node name set, will use " + "kernel supplied name '%s'\n", devname); + event->name = strdup(devname); + if (event->name == NULL) + goto exit_add; + } + } + if (event->name == NULL) { + info(event->udev, "no node name set, will use device name '%s'\n", udev_device_get_sysname(event->dev)); event->name = strdup(udev_device_get_sysname(event->dev)); - if (event->name == NULL) - goto exit; } + if (event->name == NULL) + goto exit_add; /* set device node name */ util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename)); @@ -589,28 +604,24 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) util_strlcat(filename, event->name, sizeof(filename)); udev_device_set_devnode(dev, filename); - /* read current database entry */ - dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev)); - if (dev_old != NULL) { - udev_device_read_db(dev_old); - udev_device_set_info_loaded(dev_old); - } - - /* update database, create node and symlinks */ + /* write current database entry */ udev_device_update_db(dev); - err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test); /* remove/update possible left-over symlinks from old database entry */ - if (dev_old != NULL) { - udev_node_update_old_links(dev, dev_old, event->test); - udev_device_unref(dev_old); - } + if (dev_old != NULL) + udev_node_update_old_links(dev, dev_old); + + /* create new node and symlinks */ + err = udev_node_add(dev, event->mode, event->uid, event->gid); +exit_add: + udev_device_unref(dev_old); goto exit; } /* add netif */ if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) { dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev)); + udev_device_delete_db(dev); udev_rules_apply_to_event(rules, event); if (event->ignore_device) { @@ -644,6 +655,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev)); } } + udev_device_update_db(dev); goto exit; } @@ -654,6 +666,9 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) udev_device_set_info_loaded(dev); udev_device_delete_db(dev); + /* remove watch */ + udev_watch_end(event->udev, dev); + if (udev_device_get_devnode(dev) == NULL) { char devnode[UTIL_PATH_SIZE]; @@ -676,7 +691,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) goto exit; } - err = udev_node_remove(dev, event->test); + err = udev_node_remove(dev); goto exit; } @@ -684,6 +699,11 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) udev_rules_apply_to_event(rules, event); if (event->ignore_device) info(event->udev, "device event will be ignored\n"); + + if (strcmp(udev_device_get_action(dev), "remove") != 0) + udev_device_update_db(dev); + else + udev_device_delete_db(dev); exit: return err; }