From 4227498343144cf5b3b8a48d0b5fbc55c34cd6fb Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 17 Dec 2008 17:37:51 -1000 Subject: Call 'udevadm settle' instead of 'udevsettle'. Log file had a message telling us to use 'udevadm settle' instead of 'udevsettle' and that udevsettle support as argv[0] will be removed in the future. This patch changes loader to call 'udevadm settle'. [rawhide] --- loader/hardware.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'loader/hardware.c') diff --git a/loader/hardware.c b/loader/hardware.c index 202c64187..e9be27933 100644 --- a/loader/hardware.c +++ b/loader/hardware.c @@ -75,7 +75,7 @@ static int detectHardware() { logMessage(DEBUGLVL, "waiting for hardware to initialize"); if (!(child = fork())) { - char *args[] = { "/sbin/udevsettle", "udevsettle", NULL, NULL }; + char *args[] = { "/sbin/udevadm", "settle", NULL, NULL }; int fd = open("/dev/tty3", O_RDWR); dup2(fd, 0); @@ -84,13 +84,13 @@ static int detectHardware() { close(fd); if (timeout) { - if (asprintf(&args[2],"--timeout=%d",timeout) == -1) { + if (asprintf(&args[2], "--timeout=%d", timeout) == -1) { logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); abort(); } } - rc = execv("/sbin/udevsettle",args); + rc = execv("/sbin/udevadm", args); _exit(1); } -- cgit