/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include "daemon.h"
#include "actions.h"
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;
r = command (&out, &err, "mount", NULL);
if (r == -1) {
free (out);
return NULL;
}
+ if (mp) {
+ p2 += 12; /* 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;
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
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;
+}