X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=8c550d38aa3b8f2154c2fc0a073ac75811d6476d;hp=3adedac0807b722cd9c9b38dc665387feff33de0;hb=ac77e95948edc199cdd690de38f08e4d1e615840;hpb=c7c00276f6f26ff7f38e99d887137bc1f172a978

diff --git a/udevd.c b/udevd.c
index 3adedac08..8c550d38a 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1006,6 +1006,35 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
+	/* setup signal handler pipe */
+	retval = pipe(signal_pipe);
+	if (retval < 0) {
+		err("error getting pipes: %s", strerror(errno));
+		goto exit;
+	}
+
+	retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+	if (retval < 0) {
+		err("error fcntl on read pipe: %s", strerror(errno));
+		goto exit;
+	}
+	retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
+	if (retval < 0) {
+		err("error fcntl on read pipe: %s", strerror(errno));
+		goto exit;
+	}
+
+	retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+	if (retval < 0) {
+		err("error fcntl on write pipe: %s", strerror(errno));
+		goto exit;
+	}
+	retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
+	if (retval < 0) {
+		err("error fcntl on write pipe: %s", strerror(errno));
+		goto exit;
+	}
+
 	/* parse the rules and keep them in memory */
 	sysfs_init();
 	udev_rules_init(&rules, 1);
@@ -1062,35 +1091,6 @@ int main(int argc, char *argv[], char *envp[])
 		close(fd);
 	}
 
-	/* setup signal handler pipe */
-	retval = pipe(signal_pipe);
-	if (retval < 0) {
-		err("error getting pipes: %s", strerror(errno));
-		goto exit;
-	}
-
-	retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
-	if (retval < 0) {
-		err("error fcntl on read pipe: %s", strerror(errno));
-		goto exit;
-	}
-	retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
-	if (retval < 0) {
-		err("error fcntl on read pipe: %s", strerror(errno));
-		goto exit;
-	}
-
-	retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
-	if (retval < 0) {
-		err("error fcntl on write pipe: %s", strerror(errno));
-		goto exit;
-	}
-	retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
-	if (retval < 0) {
-		err("error fcntl on write pipe: %s", strerror(errno));
-		goto exit;
-	}
-
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(struct sigaction));
 	act.sa_handler = (void (*)(int)) sig_handler;
@@ -1104,7 +1104,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* watch rules directory */
 	inotify_fd = inotify_init();
 	if (inotify_fd >= 0)
-		inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+		inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
 	else if (errno == ENOSYS)
 		err("the kernel does not support inotify, udevd can't monitor configuration file changes");
 	else