X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm-settle.c;h=e70b351eb90690d43aa971c00b7d4e42660ca718;hb=ddcbc8737873ca1904562d7d3ca3de9946e2f889;hp=d7fbc9e5605ac12c00d9d3d93015f34a94879347;hpb=baa30fbc2c04b23209d0b8fb3c86cd15ef9ea81a;p=elogind.git diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index d7fbc9e56..e70b351eb 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -53,7 +53,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) int quiet = 0; const char *exists = NULL; unsigned int timeout = 120; - struct pollfd pfd[1]; + struct pollfd pfd[1] = { {.fd = -1}, }; struct udev_queue *udev_queue = NULL; int rc = EXIT_FAILURE; @@ -152,8 +152,8 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) if (pfd[0].fd < 0) { log_error("inotify_init failed: %m\n"); } else { - if (inotify_add_watch(pfd[0].fd, udev_get_run_path(udev), IN_MOVED_TO) < 0) { - log_error("watching '%s' failed\n", udev_get_run_path(udev)); + if (inotify_add_watch(pfd[0].fd, "/run/udev" , IN_MOVED_TO) < 0) { + log_error("watching /run/udev failed\n"); close(pfd[0].fd); pfd[0].fd = -1; }