X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=3abdabddaf53af11d64751880b69492b3eceaaaa;hb=5e62afd7ce5145eee1894fab6f0722119fee1d31;hp=440ec0de40c1a7fad8a83d081e4ca90ba61c8090;hpb=99bd425a0a8fb02c27e0c22b32dafa804773a7b1;p=libguestfs.git

diff --git a/daemon/mount.c b/daemon/mount.c
index 440ec0d..3abdabd 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -30,7 +30,8 @@
 int root_mounted = 0;
 
 /* The "simple mount" call offers no complex options, you can just
- * mount a device on a mountpoint.
+ * mount a device on a mountpoint.  The variations like mount_ro,
+ * mount_options and mount_vfs let you set progressively more things.
  *
  * It's tempting to try a direct mount(2) syscall, but that doesn't
  * do any autodetection, so we are better off calling out to
@@ -38,7 +39,8 @@ int root_mounted = 0;
  */
 
 int
-do_mount (const char *device, const char *mountpoint)
+do_mount_vfs (const char *options, const char *vfstype,
+	      const char *device, const char *mountpoint)
 {
   int len, r, is_root;
   char *mp;
@@ -61,8 +63,12 @@ do_mount (const char *device, const char *mountpoint)
 
   snprintf (mp, len, "/sysroot%s", mountpoint);
 
-  r = command (NULL, &error,
-	       "mount", "-o", "sync,noatime", device, mp, NULL);
+  if (vfstype)
+    r = command (NULL, &error,
+		 "mount", "-o", options, "-t", vfstype, device, mp, NULL);
+  else
+    r = command (NULL, &error,
+		 "mount", "-o", options, device, mp, NULL);
   if (r == -1) {
     reply_with_error ("mount: %s on %s: %s", device, mountpoint, error);
     free (error);
@@ -74,3 +80,137 @@ do_mount (const char *device, const char *mountpoint)
 
   return 0;
 }
+
+int
+do_mount (const char *device, const char *mountpoint)
+{
+  return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
+}
+
+int
+do_mount_ro (const char *device, const char *mountpoint)
+{
+  return do_mount_vfs ("ro", NULL, device, mountpoint);
+}
+
+int
+do_mount_options (const char *options, const char *device,
+		  const char *mountpoint)
+{
+  return do_mount_vfs (options, NULL, device, mountpoint);
+}
+
+/* Again, use the external /bin/umount program, so that /etc/mtab
+ * is kept updated.
+ */
+int
+do_umount (const char *pathordevice)
+{
+  int len, freeit = 0, r;
+  char *buf;
+  char *err;
+
+  if (strncmp (pathordevice, "/dev/", 5) == 0)
+    buf = (char *) pathordevice;
+  else {
+    len = strlen (pathordevice) + 9;
+    freeit = 1;
+    buf = malloc (len);
+    if (buf == NULL) {
+      reply_with_perror ("malloc");
+      return -1;
+    }
+    snprintf (buf, len, "/sysroot%s", pathordevice);
+  }
+
+  r = command (NULL, &err, "umount", buf, NULL);
+  if (freeit) free (buf);
+  if (r == -1) {
+    reply_with_error ("umount: %s: %s", pathordevice, err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  /* update root_mounted? */
+
+  return 0;
+}
+
+char **
+do_mounts (void)
+{
+  char *out, *err;
+  int r;
+  char **ret = NULL;
+  int size = 0, alloc = 0;
+  char *p, *pend, *p2;
+
+  r = command (&out, &err, "mount", NULL);
+  if (r == -1) {
+    reply_with_error ("mount: %s", err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  p = out;
+  while (p) {
+    pend = strchr (p, '\n');
+    if (pend) {
+      *pend = '\0';
+      pend++;
+    }
+
+    /* Lines have the format:
+     *   /dev/foo on /mountpoint type ...
+     */
+    p2 = strstr (p, " on /sysroot");
+    if (p2 != NULL) {
+      *p2 = '\0';
+      if (add_string (&ret, &size, &alloc, p) == -1) {
+	free (out);
+	return NULL;
+      }
+    }
+
+    p = pend;
+  }
+
+  free (out);
+
+  if (add_string (&ret, &size, &alloc, NULL) == -1)
+    return NULL;
+
+  return ret;
+}
+
+/* Only unmount stuff under /sysroot */
+int
+do_umount_all (void)
+{
+  char **mounts;
+  int i, r;
+  char *err;
+
+  mounts = do_mounts ();
+  if (mounts == NULL)		/* do_mounts has already replied */
+    return -1;
+
+  for (i = 0; mounts[i] != NULL; ++i) {
+    r = command (NULL, &err, "umount", mounts[i], NULL);
+    if (r == -1) {
+      reply_with_error ("umount: %s: %s", mounts[i], err);
+      free (err);
+      free_strings (mounts);
+      return -1;
+    }
+    free (err);
+  }
+
+  free_strings (mounts);
+  return 0;
+}