search for: str_udevadm

...00644 --- 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

...44 > --- a/daemon/guestfsd.c > +++ b/daemon/guestfsd.c > @@ -1213,13 +1213,18 @@ random_name (char *template) > * fussed if it fails. > */ > void > -udev_settle (void) > +udev_settle_file (const char *file) > { > - char cmd[80]; > + size_t cmd_size = strlen (str_udevadm) + > + sizeof (" settle") + > + sizeof (" --debug") + > + (file ? sizeof (" --exit-if-exists=") + strlen (file) : 0); > + char *cmd = malloc (cmd_size); > int r; > > - snprintf (cmd...

...(char *template); > diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c > index 85ce5d2ad..b82c98acd 100644 > --- a/daemon/guestfsd.c > +++ b/daemon/guestfsd.c > @@ -63,6 +63,8 @@ > > #include "daemon.h" > > +#define MAX_ARGS 64 > + > GUESTFSD_EXT_CMD(str_udevadm, udevadm); > GUESTFSD_EXT_CMD(str_uuidgen, uuidgen); > > @@ -1213,20 +1215,35 @@ random_name (char *template) > * fussed if it fails. > */ > void > -udev_settle (void) > +udev_settle_file (const char *file) > { > - char cmd[80]; > + const char *argv[MAX_A...

...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 nam...

...fs(3)/EXTENDING LIBGUESTFS for more * info about these. In GCC 4.8.0 the warning is even harder to diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 584c685..7f4b2f2 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -57,6 +57,7 @@ #include "daemon.h" GUESTFSD_EXT_CMD(str_udevadm, udevadm); +GUESTFSD_EXT_CMD(str_uuidgen, uuidgen); #ifndef MAX # define MAX(a,b) ((a)>(b)?(a):(b)) @@ -1509,6 +1510,24 @@ udev_settle (void) fprintf (stderr, "warning: udevadm command failed\n"); } +char * +get_random_uuid (void) +{ + int r; + char *out; + CLEANUP_FREE...

...= command (NULL, &err, str_grub_install, buf, device, NULL); free (buf); if (r == -1) { diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 80175e0..e6d5fde 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -53,6 +53,9 @@ #include "daemon.h" +GUESTFSD_EXT_CMD(str_udevadm, udevadm); +GUESTFSD_EXT_CMD(str_udevsettle, udevsettle); + static char *read_cmdline (void); #ifndef MAX @@ -1294,6 +1297,6 @@ random_name (char *template) void udev_settle (void) { - (void) command (NULL, NULL, "udevadm", "settle", NULL); - (void) command (NULL, NULL,...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (7):

...= command (NULL, &err, str_grub_install, buf, device, NULL); free (buf); if (r == -1) { diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 80175e0..0f3c603 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -53,6 +53,9 @@ #include "daemon.h" +GUESTFS_EXT_CMD(str_udevadm, udevadm); +GUESTFS_EXT_CMD(str_udevsettle, udevsettle); + static char *read_cmdline (void); #ifndef MAX @@ -1294,6 +1297,6 @@ random_name (char *template) void udev_settle (void) { - (void) command (NULL, NULL, "udevadm", "settle", NULL); - (void) command (NULL, NULL,...

..."grub-install", buf, device, NULL); if (r == -1) { if (verbose) diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index b3f40628b..bcded501a 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -63,9 +63,6 @@ #include "daemon.h" -GUESTFSD_EXT_CMD(str_udevadm, udevadm); -GUESTFSD_EXT_CMD(str_uuidgen, uuidgen); - #ifndef MAX # define MAX(a,b) ((a)>(b)?(a):(b)) #endif @@ -1095,7 +1092,7 @@ udev_settle_file (const char *file) size_t i = 0; int r; - ADD_ARG (argv, i, str_udevadm); + ADD_ARG (argv, i, "udevadm"); if (verbose)...

In v2: - Kernel command line parsing now moved to the appliance. - In the captive daemon test, the daemon cleanly shuts down on exit. - Add another btrfs test. Rich.

..."grub-install", buf, device, NULL); if (r == -1) { if (verbose) diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index b3f40628b..86592e8dc 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -63,8 +63,7 @@ #include "daemon.h" -GUESTFSD_EXT_CMD(str_udevadm, udevadm); -GUESTFSD_EXT_CMD(str_uuidgen, uuidgen); +DECLARE_EXTERNAL_COMMANDS ("udevadm", "uuidgen") #ifndef MAX # define MAX(a,b) ((a)>(b)?(a):(b)) @@ -144,6 +143,7 @@ main (int argc, char *argv[]) { "channel", 1, 0, 'c' }, { "listen&quo...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’