X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Fudev-event.c;h=60d06aa084900e2a3c10dc3127bf76fd59dfa59f;hb=578cd5101d55ac1b6ac05e0e2ea7107633aa45f0;hp=100a79c1e84e1435b0c11fa8e29dbcc44f86217d;hpb=9c6a11b1c6c68dabfd28b72d361da0e1930c7321;p=elogind.git diff --git a/udev/udev-event.c b/udev/udev-event.c index 100a79c1e..60d06aa08 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -454,7 +454,7 @@ static void rename_netif_kernel_log(struct ifreq ifr) return; } - fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n", + fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n", getpid(), ifr.ifr_name, ifr.ifr_newname); fclose(f); } @@ -539,7 +539,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) return -1; if (strcmp(udev_device_get_action(dev), "remove") == 0) { - udev_device_read_db(dev); + udev_device_read_db(dev, NULL); udev_device_delete_db(dev); udev_device_tag_index(dev, NULL, false); @@ -553,7 +553,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) } else { event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev)); if (event->dev_db != NULL) { - udev_device_read_db(event->dev_db); + udev_device_read_db(event->dev_db, NULL); udev_device_set_info_loaded(event->dev_db); /* disable watch during event processing */ @@ -688,7 +688,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) info(event->udev, "delay execution of '%s'\n", program); sleep(event->exec_delay); } - if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask, true) != 0) { + if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) { if (udev_list_entry_get_flags(list_entry)) err = -1; }