X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcommand.c;h=1a50264b3c4c100b6d0c6f467ccc3e06a4c5faa1;hp=589ca76931ae5fdb2596933b3af782592fa36044;hb=e02066bcb33a2aed5f23dd18c3168dc66efddb18;hpb=5365ebd501850ea10d9a5b28fc6480ea34dbe16d

diff --git a/daemon/command.c b/daemon/command.c
index 589ca76..1a50264 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -31,6 +31,7 @@ do_command (char * const * const argv)
 {
   char *out, *err;
   int r;
+  int proc_ok, dev_ok, sys_ok;
 
   /* We need a root filesystem mounted to do this. */
   NEED_ROOT (NULL);
@@ -44,10 +45,29 @@ do_command (char * const * const argv)
     return NULL;
   }
 
+  /* While running the command, bind-mount /dev, /proc, /sys
+   * into the chroot.  However we must be careful to unmount them
+   * afterwards because otherwise they would interfere with
+   * future mount and unmount operations.
+   *
+   * We deliberately allow these commands to fail silently, BUT
+   * if a mount fails, don't unmount the corresponding mount.
+   */
+  r = command (NULL, NULL, "mount", "--bind", "/dev", "/sysroot/dev", NULL);
+  dev_ok = r != -1;
+  r = command (NULL, NULL, "mount", "--bind", "/proc", "/sysroot/proc", NULL);
+  proc_ok = r != -1;
+  r = command (NULL, NULL, "mount", "--bind", "/sys", "/sysroot/sys", NULL);
+  sys_ok = r != -1;
+
   CHROOT_IN;
   r = commandv (&out, &err, argv);
   CHROOT_OUT;
 
+  if (sys_ok) command (NULL, NULL, "umount", "/sysroot/sys", NULL);
+  if (proc_ok) command (NULL, NULL, "umount", "/sysroot/proc", NULL);
+  if (dev_ok) command (NULL, NULL, "umount", "/sysroot/dev", NULL);
+
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -64,38 +84,17 @@ char **
 do_command_lines (char * const * const argv)
 {
   char *out;
-  char **lines = NULL;
-  int size = 0, alloc = 0;
-  char *p, *pend;
+  char **lines;
 
   out = do_command (argv);
   if (out == NULL)
     return NULL;
 
-  /* Now convert the output to a list of lines. */
-  p = out;
-  while (p) {
-    pend = strchr (p, '\n');
-    if (pend) {
-      *pend = '\0';
-      pend++;
-    }
-
-    /* Final \n?  Don't return an empty final element. */
-    if (pend && *pend == '\0') break;
-
-    if (add_string (&lines, &size, &alloc, p) == -1) {
-      free (out);
-      return NULL;
-    }
-
-    p = pend;
-  }
-
+  lines = split_lines (out);
   free (out);
 
-  if (add_string (&lines, &size, &alloc, NULL) == -1)
+  if (lines == NULL)
     return NULL;
 
-  return lines;
+  return lines;			/* Caller frees. */
 }