search for: drvs

...dex 7ae8adf..26f77fd 100644 --- a/align/scan.c +++ b/align/scan.c @@ -236,7 +236,7 @@ main (int argc, char *argv[]) error (EXIT_FAILURE, 0, _("--uuid option cannot be used with -a or -d")); /* Add domains/drives from the command line (for a single guest). */ - add_drives (drvs, 'a'); + add_drives (drvs, 0); if (guestfs_launch (g) == -1) exit (EXIT_FAILURE); diff --git a/cat/cat.c b/cat/cat.c index 9fa8b4f..990fc90 100644 --- a/cat/cat.c +++ b/cat/cat.c @@ -236,7 +236,7 @@ main (int argc, char *argv[]) } /* Add drives, inspect and mount. *...

...++++++-- 10 files changed, 87 insertions(+), 22 deletions(-) diff --git a/cat/cat.c b/cat/cat.c index 0370fbd..4d671ca 100644 --- a/cat/cat.c +++ b/cat/cat.c @@ -224,8 +224,11 @@ main (int argc, char *argv[]) CHECK_OPTION_format_consumed; /* User must have specified some drives. */ - if (drvs == NULL) + if (drvs == NULL) { + fprintf (stderr, _("%s: error: you must specify at least one -a or -d option.\n"), + guestfs_int_program_name); usage (EXIT_FAILURE); + } /* Add drives, inspect and mount. */ add_drives (drvs, 'a'); diff --git a/cat/fi...

--autosysroot option uses suggestions to user on how to mount filesystems and change root suggested by --suggest option in virt-rescue. Commands are passed on kernel command line in format guestfs_command=command;. Command ends with a semicolon and there can be multiple commands specified. These are executed just before bash starts. On successfull run user is presented directly with bash in

...o echo "virt-rescue: Syncing the disk now before exiting ..." diff --git a/rescue/rescue.c b/rescue/rescue.c index 135c9e6..77b6544 100644 --- a/rescue/rescue.c +++ b/rescue/rescue.c @@ -37,7 +37,7 @@ #include "options.h" static void add_scratch_disks (int n, struct drv **drvs); -static void do_suggestion (struct drv *drvs); +static char ** do_suggestion (struct drv *drvs); /* Currently open libguestfs handle. */ guestfs_h *g; @@ -50,6 +50,9 @@ int echo_keys = 0; const char *libvirt_uri = NULL; int inspector = 0; +static void use_suggestions (char **cmds); +stati...

--autosysroot option uses suggestions to user on how to mount filesystems and change root suggested by --suggest option in virt-rescue. Commands are passed on kernel command line in format guestfs_command=command;. Command ends with a semicolon and there can be multiple commands specified. These are executed just before bash starts. On successfull run user is presented directly with bash in

...disk now before exiting ..." > diff --git a/rescue/rescue.c b/rescue/rescue.c > index 135c9e6..77b6544 100644 > --- a/rescue/rescue.c > +++ b/rescue/rescue.c > @@ -37,7 +37,7 @@ > #include "options.h" > > static void add_scratch_disks (int n, struct drv **drvs); > -static void do_suggestion (struct drv *drvs); > +static char ** do_suggestion (struct drv *drvs); > > /* Currently open libguestfs handle. */ > guestfs_h *g; > @@ -50,6 +50,9 @@ int echo_keys = 0; > const char *libvirt_uri = NULL; > int inspector = 0; > >...

...boot.img >$TFTP_ARCHIVE/etherboot.nbi make the syslinux/etherboot floppy: # make the etherboot zlilo style image... export ETHERBOOT_SRC_DIR=/usr/local/src/etherboot-5.4.0 ( cd $ETHERBOOT_SRC_DIR/src make clean perl -p -i -e 's{-DASK_BOOT=3\s+}{}' Config DRVS= DRIVERS= DRVS=" e1000 eepro eepro100 rtl8139 pcnet32 tg3 3c90x 3c509" DRVS="$DRVS tulip ne wd natsemi via-rhine w89c840 smc9000 cs89x0" DRVS="$DRVS epic100 sis900" for d in $DRVS ; do DRIVERS="${DRIVERS}--${d}"...

...>> diff --git a/rescue/rescue.c b/rescue/rescue.c >> index 135c9e6..77b6544 100644 >> --- a/rescue/rescue.c >> +++ b/rescue/rescue.c >> @@ -37,7 +37,7 @@ >> #include "options.h" >> >> static void add_scratch_disks (int n, struct drv **drvs); >> -static void do_suggestion (struct drv *drvs); >> +static char ** do_suggestion (struct drv *drvs); >> >> /* Currently open libguestfs handle. */ >> guestfs_h *g; >> @@ -50,6 +50,9 @@ int echo_keys = 0; >> const char *libvirt_uri = NULL; >&...

...estfs handle. */ > +guestfs_h *g; > + > +int read_only = 1; > +int live = 0; > +int verbose = 0; > +int keys_from_stdin = 0; > +int echo_keys = 0; > +const char *libvirt_uri = NULL; > +int inspector = 1; > + > +static int do_tail (int argc, char *argv[], struct drv *drvs, struct mp *mps); > +static time_t disk_mtime (struct drv *drvs); > +static int add_and_mount (struct drv *drvs, struct mp *mps, int *windows_ret); > +static int reopen_handle (void); > + > +static void __attribute__((noreturn)) > +usage (int status) > +{ > + if (status !=...

Nothing new in the virt-tail command itself, but the second commit includes a simple test. Rich.

...nclude "windows.h" + +/* Currently open libguestfs handle. */ +guestfs_h *g; + +int read_only = 1; +int live = 0; +int verbose = 0; +int keys_from_stdin = 0; +int echo_keys = 0; +const char *libvirt_uri = NULL; +int inspector = 1; + +static int do_tail (int argc, char *argv[], struct drv *drvs, struct mp *mps); +static time_t disk_mtime (struct drv *drvs); +static int add_and_mount (struct drv *drvs, struct mp *mps, int *windows_ret); +static int reopen_handle (void); + +static void __attribute__((noreturn)) +usage (int status) +{ + if (status != EXIT_SUCCESS) + fprintf (stderr, _(&q...

This adds a new tool which does a follow operation (ie. tail -f) on one or more log/text files inside the guest. I've only done limited testing, but it works for me for tailing various long-running builds inside guests which I'm doing at the moment. There are no tests at present. Rich.

...nclude "windows.h" + +/* Currently open libguestfs handle. */ +guestfs_h *g; + +int read_only = 1; +int live = 0; +int verbose = 0; +int keys_from_stdin = 0; +int echo_keys = 0; +const char *libvirt_uri = NULL; +int inspector = 1; + +static int do_tail (int argc, char *argv[], struct drv *drvs, struct mp *mps); +static time_t disk_mtime (struct drv *drvs); +static int reopen_handle (void); + +static void __attribute__((noreturn)) +usage (int status) +{ + if (status != EXIT_SUCCESS) + fprintf (stderr, _("Try `%s --help' for more information.\n"), + getprognam...

Depends on the previous 5 patches that modified virt-rescue to work without direct mode: https://www.redhat.com/archives/libguestfs/2017-March/msg00017.html Rich.

Since v2: - Fix the things that Pino mentioned, except the recursion. - Implement Windows support. For Windows support to be sane, I had to inline the add_and_mount code. Rich.

do a code cleanup by removing the tailing spaces Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com> --- examples/create_disk.c | 2 +- examples/inspect_vm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/create_disk.c b/examples/create_disk.c index f4b9044..bcad6d8 100644 --- a/examples/create_disk.c +++ b/examples/create_disk.c @@ -7,7 +7,7

...options[] = { { "add", 1, 0, 'a' }, + { "blocksize", 2, 0, 0 }, { "connect", 1, 0, 'c' }, { "domain", 1, 0, 'd' }, { "format", 2, 0, 0 }, @@ -131,6 +134,8 @@ main (int argc, char *argv[]) struct drv *drvs = NULL; const char *format = NULL; bool format_consumed = true; + int blocksize = 0; + bool blocksize_consumed = true; int c; int option_index; int exit_code; @@ -153,6 +158,8 @@ main (int argc, char *argv[]) display_short_options (options); else if (STREQ (long_opt...

...0, 'd' }, { "format", 2, 0, 0 }, + { "blocksize", 2, 0, 0 }, { "help", 0, 0, HELP_OPTION }, { "long-options", 0, 0, 0 }, { "quiet", 0, 0, 'q' }, @@ -131,6 +134,8 @@ main (int argc, char *argv[]) struct drv *drvs = NULL; const char *format = NULL; bool format_consumed = true; + int blocksize = 0; + bool blocksize_consumed = true; int c; int option_index; int exit_code; @@ -153,6 +158,8 @@ main (int argc, char *argv[]) display_short_options (options); else if (STREQ (long_opt...

...2 deletions(-) diff --git a/options/options.c b/options/options.c index fe63da9..63221ea 100644 --- a/options/options.c +++ b/options/options.c @@ -49,7 +49,8 @@ * Handle the guestfish I<-a> option on the command line. */ void -option_a (const char *arg, const char *format, struct drv **drvsp) +option_a (const char *arg, const char *format, int blocksize, + struct drv **drvsp) { struct uri uri; struct drv *drv; @@ -69,6 +70,7 @@ option_a (const char *arg, const char *format, struct drv **drvsp) drv->type = drv_a; drv->a.filename = uri.path; drv->...

..., 0, 0, HELP_OPTION }, { "keys-from-stdin", 0, 0, 0 }, { "long-options", 0, 0, 0 }, + { "mount", 1, 0, 'm' }, { "verbose", 0, 0, 'v' }, { "version", 0, 0, 'V' }, { 0, 0, 0, 0 } }; struct drv *drvs = NULL; struct drv *drv; + struct mp *mps = NULL; + struct mp *mp; + char *p; const char *format = NULL; int c; int r; @@ -152,6 +159,11 @@ main (int argc, char *argv[]) OPTION_d; break; + case 'm': + OPTION_m; + inspector = 0; + break; +...