Olaf Hering
2012-Sep-03 08:58 UTC
[Libguestfs] [PATCH] daemon: remove call to obsolete udevsettle
udevadm is included in all reasonable recent distributions.
This avoids 'command not found' errors in verbose mode.
Signed-off-by: Olaf Hering <olaf at aepfle.de>
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index e6d5fde..0db56e4 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -54,7 +54,6 @@
#include "daemon.h"
GUESTFSD_EXT_CMD(str_udevadm, udevadm);
-GUESTFSD_EXT_CMD(str_udevsettle, udevsettle);
static char *read_cmdline (void);
@@ -1287,16 +1286,9 @@ random_name (char *template)
*
* Use 'udevadm settle' after certain commands, but don't be too
* fussed if it fails.
- *
- * 'udevsettle' was the old name for this command (RHEL 5). This was
- * deprecated in favour of 'udevadm settle'. The old
'udevsettle'
- * command was left as a symlink. Then in Fedora 13 the old symlink
- * remained but it stopped working (RHBZ#548121), so we have to be
- * careful not to assume that we can use 'udevsettle' if it exists.
*/
void
udev_settle (void)
{
(void) command (NULL, NULL, str_udevadm, "settle", NULL);
- (void) command (NULL, NULL, str_udevsettle, NULL);
}
--
1.7.11.5
Richard W.M. Jones
2012-Sep-03 10:01 UTC
[Libguestfs] [PATCH] daemon: remove call to obsolete udevsettle
Thanks -- I'll push this upstream soon, and the reverse in 'oldlinux'. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
Possibly Parallel Threads
- udevsettle failures
- Re: [PATCH v2 1/2] daemon: run 'udevadm settle' with --exit-if-exists option
- Re: [PATCH 1/2] daemon: run 'udevadm settle' with --exit-if-exists option
- [PATCH v2] daemon: collect list of called external commands
- [PATCH] daemon: Work around udevsettle issue (RHBZ#548121).