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 +++---
scripts/mk-images | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/loader/hardware.c b/loader/hardware.c
index 202c641..67a2953 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", "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[3], "--timeout=%d", timeout) == -1) {
logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
abort();
}
}
- rc = execv("/sbin/udevsettle",args);
+ rc = execv("/sbin/udevadm", args);
_exit(1);
}
diff --git a/scripts/mk-images b/scripts/mk-images
index a405df7..a8c5bdb 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -618,7 +618,6 @@ makeinitrd() {
instbin $IMGPATH /usr/sbin/udevd $MBD_DIR /sbin/udevd
instbin $IMGPATH /usr/sbin/udevadm $MBD_DIR /sbin/udevadm
instbin $IMGPATH /usr/bin/udevinfo $MBD_DIR /sbin/udevinfo
- ln -s udevadm $MBD_DIR/sbin/udevsettle
instbin $IMGPATH /usr/bin/bash $MBD_DIR /sbin/bash
( cd $MBD_DIR/sbin ; ln -sf bash sh )
--
1.6.0.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
