search for: c46c775

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

...error: you must specify at least one -a or -d option.\n"), + guestfs_int_program_name); usage (EXIT_FAILURE); + } /* Add drives, inspect and mount. Note that inspector is always true, * and there is no -m option. diff --git a/rescue/rescue.c b/rescue/rescue.c index c46c775..135c9e6 100644 --- a/rescue/rescue.c +++ b/rescue/rescue.c @@ -275,14 +275,22 @@ main (int argc, char *argv[]) assert (live == 0); /* Must be no extra arguments on the command line. */ - if (optind != argc) + if (optind != argc) { + fprintf (stderr, _("%s: error: extra argument &...

..., r); - exit (EXIT_FAILURE); - } + if (r < 0) + error (EXIT_FAILURE, 0, "PCRE error reading substring (%d)", r); r = STREQ (magic, matched); pcre_free_substring (matched); if (!r) diff --git a/rescue/rescue.c b/rescue/rescue.c index 37a0c3f..c46c775 100644 --- a/rescue/rescue.c +++ b/rescue/rescue.c @@ -133,10 +133,8 @@ main (int argc, char *argv[]) int suggest = 0; g = guestfs_create (); - if (g == NULL) { - fprintf (stderr, _("guestfs_create: failed to create handle\n")); - exit (EXIT_FAILURE); - } + if (g == NULL)...

Wherever we had code which did: if (something_bad) { perror (...); exit (EXIT_FAILURE); } replace this with use of the error(3) function: if (something_bad) error (EXIT_FAILURE, errno, ...); The error(3) function is supplied by glibc, or by gnulib on platforms which don't have it, and is much more flexible than perror(3). Since we already use error(3), there seems to be