X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcommand.c;h=7c67d830b0849f1081ef89b34f2756953843864b;hp=9fbbd95931d34be62f6b8397f0dd348a87370c02;hb=9ba779ea367b2ea7077da7bdd75e813cd06c7eea;hpb=adf20c0c4d9f488d55254f54a79079b9cacbde8d

diff --git a/daemon/command.c b/daemon/command.c
index 9fbbd95..7c67d83 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -22,10 +22,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
+#include "ignore-value.h"
+
+static inline void
+umount_ignore_fail (const char *path)
+{
+  ignore_value (command (NULL, NULL, "umount", path, NULL));
+}
+
 char *
 do_command (char *const *argv)
 {
@@ -36,14 +44,14 @@ do_command (char *const *argv)
   int dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok;
 
   /* We need a root filesystem mounted to do this. */
-  NEED_ROOT (return NULL);
+  NEED_ROOT (, return NULL);
 
   /* Conveniently, argv is already a NULL-terminated argv-style array
    * of parameters, so we can pass it straight in to our internal
    * commandv.  We just have to check the list is non-empty.
    */
   if (argv[0] == NULL) {
-    reply_with_error ("command: passed an empty list");
+    reply_with_error ("passed an empty list");
     return NULL;
   }
 
@@ -85,14 +93,14 @@ do_command (char *const *argv)
   sys_ok = r != -1;
 
   CHROOT_IN;
-  r = commandv (&out, &err, argv);
+  r = commandv (&out, &err, (const char * const *) argv);
   CHROOT_OUT;
 
-  if (sys_ok) command (NULL, NULL, "umount", sysroot_sys, NULL);
-  if (selinux_ok) command (NULL, NULL, "umount", sysroot_selinux, 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 (sys_ok) umount_ignore_fail (sysroot_sys);
+  if (selinux_ok) umount_ignore_fail (sysroot_selinux);
+  if (proc_ok) umount_ignore_fail (sysroot_proc);
+  if (dev_pts_ok) umount_ignore_fail (sysroot_dev_pts);
+  if (dev_ok) umount_ignore_fail (sysroot_dev);
 
   free (sysroot_dev);
   free (sysroot_dev_pts);
@@ -132,17 +140,17 @@ do_command_lines (char *const *argv)
 }
 
 char *
-do_sh (const char *command)
+do_sh (const char *cmd)
 {
-  const char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
   return do_command ((char **) argv);
 }
 
 char **
-do_sh_lines (const char *command)
+do_sh_lines (const char *cmd)
 {
-  const char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
 
   return do_command_lines ((char **) argv);
 }