Generated code for 'glob-expand'.

[libguestfs.git] / daemon / command.c

diff --git a/daemon/command.c b/daemon/command.c
index 1a50264..b33f2db 100644 (file)
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -27,11 +27,11 @@
 #include "actions.h"
 
 char *
-do_command (char * const * const argv)
+do_command (char **argv)
 {
   char *out, *err;
   int r;
-  int proc_ok, dev_ok, sys_ok;
+  int proc_ok, dev_ok, dev_pts_ok, sys_ok;
 
   /* We need a root filesystem mounted to do this. */
   NEED_ROOT (NULL);
@@ -55,6 +55,8 @@ do_command (char * const * const argv)
    */
   r = command (NULL, NULL, "mount", "--bind", "/dev", "/sysroot/dev", NULL);
   dev_ok = r != -1;
+  r = command (NULL, NULL, "mount", "--bind", "/dev/pts", "/sysroot/dev/pts", NULL);
+  dev_pts_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);
@@ -66,6 +68,7 @@ do_command (char * const * const argv)
 
   if (sys_ok) command (NULL, NULL, "umount", "/sysroot/sys", NULL);
   if (proc_ok) command (NULL, NULL, "umount", "/sysroot/proc", NULL);
+  if (dev_pts_ok) command (NULL, NULL, "umount", "/sysroot/dev/pts", NULL);
   if (dev_ok) command (NULL, NULL, "umount", "/sysroot/dev", NULL);
 
   if (r == -1) {
@@ -81,7 +84,7 @@ do_command (char * const * const argv)
 }
 
 char **
-do_command_lines (char * const * const argv)
+do_command_lines (char **argv)
 {
   char *out;
   char **lines;
@@ -98,3 +101,19 @@ do_command_lines (char * const * const argv)
 
   return lines;                        /* Caller frees. */
 }
+
+char *
+do_sh (char *command)
+{
+  char *argv[] = { "/bin/sh", "-c", command, NULL };
+
+  return do_command (argv);
+}
+
+char **
+do_sh_lines (char *command)
+{
+  char *argv[] = { "/bin/sh", "-c", command, NULL };
+
+  return do_command_lines (argv);
+}