Libguestfs - Oct 2015 - [PATCH] daemon: use str_udevadm in udev_settle

There is GUESTFSD_EXT_CMD defining a string for udevadm (so it is marked
as "used tool" in the appliance), but it is not actually used when
starting udevadm.

There should be no behaviour change.
---
 daemon/guestfsd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 7b33a3a..4502190 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -1501,7 +1501,8 @@ udev_settle (void)
   char cmd[80];
   int r;
 
-  snprintf (cmd, sizeof cmd, "udevadm%s settle", verbose ? "
--debug" : "");
+  snprintf (cmd, sizeof cmd, "%s%s settle",
+            str_udevadm, verbose ? " --debug" : "");
   if (verbose)
     printf ("%s\n", cmd);
   r = system (cmd);
-- 
2.1.0

On Mon, Oct 05, 2015 at 04:10:49PM +0200, Pino Toscano
wrote:
> There is GUESTFSD_EXT_CMD defining a string for udevadm (so it is marked
> as "used tool" in the appliance), but it is not actually used
when
> starting udevadm.
> 
> There should be no behaviour change.
> ---
>  daemon/guestfsd.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
> index 7b33a3a..4502190 100644
> --- a/daemon/guestfsd.c
> +++ b/daemon/guestfsd.c
> @@ -1501,7 +1501,8 @@ udev_settle (void)
>    char cmd[80];
>    int r;
>  
> -  snprintf (cmd, sizeof cmd, "udevadm%s settle", verbose ?
" --debug" : "");
> +  snprintf (cmd, sizeof cmd, "%s%s settle",
> +            str_udevadm, verbose ? " --debug" : "");
>    if (verbose)
>      printf ("%s\n", cmd);
>    r = system (cmd);
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org