search for: start_ssh

(I don't have a BZ# for this yet, but I'm expecting it to be filed as an RFE) Currently if the user is in the virt-p2v GUI and cancels the conversion, all that happens is we abruptly close the ssh session to virt-v2v. That is bad .. possibly (or maybe not). But in any case there is an alternative: we can send a ^C key to the virt-v2v process, which it could catch and handle gracefully,

Fix and/or document issues raised in this thread: https://www.redhat.com/archives/libguestfs/2017-February/msg00010.html Rich.

--- p2v/ssh.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/p2v/ssh.c b/p2v/ssh.c index 991888348..4966097ff 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -392,6 +392,9 @@ start_ssh (unsigned spawn_flags, struct config *config, set_ssh_internal_error ("ssh: mexp_spawnvf: %m"); return NULL; } +#if DEBUG_STDERR + mexp_set_debug_file (h, stderr); +#endif /* We want the ssh ConnectTimeout to be less than the miniexpect * timeout, so that if the ser...

...0,6 +141,7 @@ compile_regexps (void) COMPILE (password_re, "password:", 0); COMPILE (ssh_message_re, "(ssh: .*)", 0); + COMPILE (sudo_password_re, "sudo: a password is required", 0); /* The magic synchronization strings all match this expression. See * start_ssh function below. */ @@ -160,6 +162,7 @@ free_regexps (void) { pcre_free (password_re); pcre_free (ssh_message_re); + pcre_free (sudo_password_re); pcre_free (prompt_re); pcre_free (version_re); pcre_free (feature_libguestfs_rewrite_re); @@ -532,6 +535,7 @@ test_connection (struc...

After debugging a virt-p2v issue with a customer in the middle of the night on Tuesday, I felt it would have been helpful to know exactly which version(s) of virt-p2v and virt-v2v they were using. That wasn't very clear from the log file I was provided with, so this change makes sure the information is included every time. Rich.

A mixed bag, but all the patches make sense together! Patch 1: Fix a bug that Tingting found: https://bugzilla.redhat.com/show_bug.cgi?id=1256222 Patch 2: Revert a patch that makes no sense now that we've added virt-v2v into base RHEL. This is just included because it's a cleanup needed before applying patch 3. Patch 3: Add the ability to use SSH identities (private keys) for virt-p2v

Fixes https://bugzilla.redhat.com/1256222

See individual patches for details. Pino Toscano (5): Include signal.h Remove unused variables Push -Wsuggest-attribute=noreturn only with GCC tests: do not set libguestfs environment variables Define the GCC version macro Makefile.am | 2 +- conversion.c | 3 +++ p2v.h | 7 +++++++ ssh.c | 8 +++++--- 4 files changed, 16 insertions(+), 4 deletions(-) -- 2.21.0

These are a prelude to fixing https://bugzilla.redhat.com/show_bug.cgi?id=1590220 A lot of the virt-p2v configuration code was duplicated manually. These changes make sure that most of it is generated. Rich.

As the subject says, support socket activation in virt-p2v. I have added upstream support for socket activation to nbdkit already: https://github.com/libguestfs/nbdkit/commit/7ff39d028c6359f5c0925ed2cf4a2c4c751af2e4 I posted a patch for qemu-nbd, still waiting on more reviews for that one: https://www.mail-archive.com/qemu-devel@nongnu.org/msg427246.html I tested this against old and new qemu

Now that virt-p2v has its own repository [1] and releases [2], it is time to remove it from libguestfs. [1] https://github.com/libguestfs/virt-p2v [2] http://download.libguestfs.org/virt-p2v/ Pino Toscano (2): Remove virt-p2v Remove remaining virt-p2v bits .gitignore | 4 - Makefile.am | 7 +- bash/Makefile.am

...+ if ((WIFEXITED (r) && WEXITSTATUS (r) != 0) || !WIFEXITED (r)) + error (EXIT_FAILURE, 0, + "%s: unexpected failure of external command", stage); } diff --git a/p2v/ssh.c b/p2v/ssh.c index 6ddfcb2..7158e70 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -415,10 +415,8 @@ start_ssh (struct config *config, char **extra_args, int wait_prompt) */ r = pcre_get_substring (h->buffer, ovector, mexp_get_pcre_error (h), 1, &matched); - if (r < 0) { - fprintf (stderr, "error: PCRE error reading substring (%d)\n&qu...

...no, "strdup"); fd = mkstemp (config->identity_file); - if (fd == -1) { - perror ("mkstemp"); - exit (EXIT_FAILURE); - } + if (fd == -1) + error (EXIT_FAILURE, errno, "mkstemp"); close (fd); /* Curl download URL to file. */ @@ -299,10 +286,8 @@ start_ssh (struct config *config, char **extra_args, int wait_prompt) else nr_args += 13; args = malloc (sizeof (char *) * nr_args); - if (args == NULL) { - perror ("malloc"); - exit (EXIT_FAILURE); - } + if (args == NULL) + error (EXIT_FAILURE, errno, "malloc");...

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.