X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=e7265fe2aea33921095651d36003b629a5c5cd45;hb=22eb7fc966bafebedfde437c9b9c9fb903a8bc35;hp=1820f8a8e4b79ea2a9b1a1987a77bb55adad5464;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git

diff --git a/daemon/mount.c b/daemon/mount.c
index 1820f8a..e7265fe 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -22,6 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "daemon.h"
 #include "actions.h"
@@ -42,7 +44,7 @@ int
 do_mount_vfs (char *options, char *vfstype,
 	      char *device, char *mountpoint)
 {
-  int len, r, is_root;
+  int r, is_root;
   char *mp;
   char *error;
 
@@ -55,16 +57,12 @@ do_mount_vfs (char *options, char *vfstype,
     return -1;
   }
 
-  len = strlen (mountpoint) + 9;
-
-  mp = malloc (len);
+  mp = sysroot_path (mountpoint);
   if (!mp) {
     reply_with_perror ("malloc");
     return -1;
   }
 
-  snprintf (mp, len, "/sysroot%s", mountpoint);
-
   if (vfstype)
     r = command (NULL, &error,
 		 "mount", "-o", options, "-t", vfstype, device, mp, NULL);
@@ -109,7 +107,7 @@ do_mount_options (char *options, char *device,
 int
 do_umount (char *pathordevice)
 {
-  int len, freeit = 0, r;
+  int freeit = 0, r;
   char *buf;
   char *err;
 
@@ -117,14 +115,12 @@ do_umount (char *pathordevice)
     buf = pathordevice;
     IS_DEVICE (buf, -1);
   } else {
-    len = strlen (pathordevice) + 9;
-    freeit = 1;
-    buf = malloc (len);
+    buf = sysroot_path (pathordevice);
     if (buf == NULL) {
       reply_with_perror ("malloc");
       return -1;
     }
-    snprintf (buf, len, "/sysroot%s", pathordevice);
+    freeit = 1;
   }
 
   r = command (NULL, &err, "umount", buf, NULL);
@@ -142,14 +138,16 @@ do_umount (char *pathordevice)
   return 0;
 }
 
-char **
-do_mounts (void)
+static char **
+mounts_or_mountpoints (int mp)
 {
   char *out, *err;
   int r;
   char **ret = NULL;
   int size = 0, alloc = 0;
   char *p, *pend, *p2;
+  int len;
+  char matching[5 + sysroot_len];
 
   r = command (&out, &err, "mount", NULL);
   if (r == -1) {
@@ -161,6 +159,11 @@ do_mounts (void)
 
   free (err);
 
+  /* Lines have the format:
+   *   /dev/foo on /mountpoint type ...
+   */
+  snprintf (matching, 5 + sysroot_len, " on %s", sysroot);
+
   p = out;
   while (p) {
     pend = strchr (p, '\n');
@@ -169,16 +172,27 @@ do_mounts (void)
       pend++;
     }
 
-    /* Lines have the format:
-     *   /dev/foo on /mountpoint type ...
-     */
-    p2 = strstr (p, " on /sysroot");
+    p2 = strstr (p, matching);
     if (p2 != NULL) {
       *p2 = '\0';
       if (add_string (&ret, &size, &alloc, p) == -1) {
 	free (out);
 	return NULL;
       }
+      if (mp) {
+	p2 += 4 + sysroot_len;	/* skip " on /sysroot" */
+	len = strcspn (p2, " ");
+
+	if (len == 0)		/* .. just /sysroot, so we turn it into "/" */
+	  p2 = (char *) "/";
+	else
+	  p2[len] = '\0';
+
+	if (add_string (&ret, &size, &alloc, p2) == -1) {
+	  free (out);
+	  return NULL;
+	}
+      }
     }
 
     p = pend;
@@ -192,6 +206,18 @@ do_mounts (void)
   return ret;
 }
 
+char **
+do_mounts (void)
+{
+  return mounts_or_mountpoints (0);
+}
+
+char **
+do_mountpoints (void)
+{
+  return mounts_or_mountpoints (1);
+}
+
 /* Unmount everything mounted under /sysroot.
  *
  * We have to unmount in the correct order, so we sort the paths by
@@ -220,6 +246,7 @@ do_umount_all (void)
   char **mounts = NULL;
   int size = 0, alloc = 0;
   char *p, *p2, *p3, *pend;
+  char matching[5 + sysroot_len];
 
   r = command (&out, &err, "mount", NULL);
   if (r == -1) {
@@ -231,6 +258,11 @@ do_umount_all (void)
 
   free (err);
 
+  /* Lines have the format:
+   *   /dev/foo on /mountpoint type ...
+   */
+  snprintf (matching, 5 + sysroot_len, " on %s", sysroot);
+
   p = out;
   while (p) {
     pend = strchr (p, '\n');
@@ -239,10 +271,7 @@ do_umount_all (void)
       pend++;
     }
 
-    /* Lines have the format:
-     *   /dev/foo on /mountpoint type ...
-     */
-    p2 = strstr (p, " on /sysroot");
+    p2 = strstr (p, matching);
     if (p2 != NULL) {
       p2 += 4;
       p3 = p2 + strcspn (p2, " ");
@@ -286,7 +315,7 @@ do_umount_all (void)
 int
 do_mount_loop (char *file, char *mountpoint)
 {
-  int len, r;
+  int r;
   char *buf, *mp;
   char *error;
 
@@ -294,22 +323,18 @@ do_mount_loop (char *file, char *mountpoint)
   ABS_PATH (file, -1);
 
   /* We have to prefix /sysroot on both the filename and the mountpoint. */
-  len = strlen (mountpoint) + 9;
-  mp = malloc (len);
+  mp = sysroot_path (mountpoint);
   if (!mp) {
     reply_with_perror ("malloc");
     return -1;
   }
-  snprintf (mp, len, "/sysroot%s", mountpoint);
 
-  len = strlen (file) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (file);
   if (!file) {
     reply_with_perror ("malloc");
     free (mp);
     return -1;
   }
-  snprintf (buf, len, "/sysroot%s", file);
 
   r = command (NULL, &error, "mount", "-o", "loop", buf, mp, NULL);
   free (mp);
@@ -322,3 +347,52 @@ do_mount_loop (char *file, char *mountpoint)
 
   return 0;
 }
+
+/* Specialized calls mkmountpoint and rmmountpoint are really
+ * variations on mkdir and rmdir which do no checking and (in the
+ * mkmountpoint case) set the root_mounted flag.
+ */
+int
+do_mkmountpoint (char *path)
+{
+  int r;
+
+  /* NEED_ROOT (-1); - we don't want this test for this call. */
+  ABS_PATH (path, -1);
+
+  CHROOT_IN;
+  r = mkdir (path, 0777);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("mkmountpoint: %s", path);
+    return -1;
+  }
+
+  /* Set the flag so that filesystems can be mounted here,
+   * not just on /sysroot.
+   */
+  root_mounted = 1;
+
+  return 0;
+}
+
+int
+do_rmmountpoint (char *path)
+{
+  int r;
+
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
+
+  CHROOT_IN;
+  r = rmdir (path);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("rmmountpoint: %s", path);
+    return -1;
+  }
+
+  return 0;
+}