summaryrefslogtreecommitdiffstats
path: root/src/appliance.c
diff options
context:
space:
mode:
authorMatthew Booth <mbooth@redhat.com>2010-10-28 15:19:12 +0100
committerRichard W.M. Jones <rjones@redhat.com>2010-10-28 16:08:47 +0100
commitcf8add59d297d196facc2d0b9af45bb1d7946344 (patch)
tree5640e57794088939318ea8bc5adc3edbf41d480f /src/appliance.c
parent06fef60db5c7a96cb59aa92c4708e10333345e90 (diff)
downloadlibguestfs-cf8add59d297d196facc2d0b9af45bb1d7946344.tar.gz
libguestfs-cf8add59d297d196facc2d0b9af45bb1d7946344.tar.xz
libguestfs-cf8add59d297d196facc2d0b9af45bb1d7946344.zip
Log the febootstrap-supermin-helper command line
A side-effect of change 17e7cb9937a63ed8f9bb0fb6ac7302758be76846 was the the febootstrap-supermin-helper was no longer logged. This change adds it back using the new guestfs___print_timestamped_argv internal function.
Diffstat (limited to 'src/appliance.c')
-rw-r--r--src/appliance.c55
1 files changed, 29 insertions, 26 deletions
diff --git a/src/appliance.c b/src/appliance.c
index 80f0f46d..a4f5f6f4 100644
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -371,6 +371,32 @@ static int
run_supermin_helper (guestfs_h *g, const char *supermin_path,
const char *cachedir, size_t cdlen)
{
+ size_t pathlen = strlen (supermin_path);
+
+ const char *argv[30];
+ size_t i = 0;
+
+ char supermin_d[pathlen + 32];
+ snprintf (supermin_d, pathlen + 32, "%s/supermin.d", supermin_path);
+ char kernel[cdlen + 32];
+ snprintf (kernel, cdlen + 32, "%s/kernel", cachedir);
+ char initrd[cdlen + 32];
+ snprintf (initrd, cdlen + 32, "%s/initrd", cachedir);
+ char root[cdlen + 32];
+ snprintf (root, cdlen + 32, "%s/root", cachedir);
+
+ argv[i++] = "febootstrap-supermin-helper";
+ if (g->verbose)
+ argv[i++] = "--verbose";
+ argv[i++] = "-f";
+ argv[i++] = "ext2";
+ argv[i++] = supermin_d;
+ argv[i++] = host_cpu;
+ argv[i++] = kernel;
+ argv[i++] = initrd;
+ argv[i++] = root;
+ argv[i++] = NULL;
+
pid_t pid = fork ();
if (pid == -1) {
perrorf (g, "fork");
@@ -378,6 +404,9 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path,
}
if (pid > 0) { /* Parent. */
+ if (g->verbose)
+ guestfs___print_timestamped_argv (g, argv);
+
int status;
if (waitpid (pid, &status, 0) == -1) {
perrorf (g, "waitpid");
@@ -422,32 +451,6 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path,
}
}
}
-
- size_t pathlen = strlen (supermin_path);
-
- const char *argv[30];
- size_t i = 0;
-
- argv[i++] = "febootstrap-supermin-helper";
- if (g->verbose)
- argv[i++] = "--verbose";
- argv[i++] = "-f";
- argv[i++] = "ext2";
- char supermin_d[pathlen + 32];
- snprintf (supermin_d, pathlen + 32, "%s/supermin.d", supermin_path);
- argv[i++] = supermin_d;
- argv[i++] = host_cpu;
- char kernel[cdlen + 32];
- snprintf (kernel, cdlen + 32, "%s/kernel", cachedir);
- argv[i++] = kernel;
- char initrd[cdlen + 32];
- snprintf (initrd, cdlen + 32, "%s/initrd", cachedir);
- argv[i++] = initrd;
- char root[cdlen + 32];
- snprintf (root, cdlen + 32, "%s/root", cachedir);
- argv[i++] = root;
- argv[i++] = NULL;
-
execvp ("febootstrap-supermin-helper", (char * const *) argv);
perror ("execvp");
_exit (EXIT_FAILURE);