#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include "daemon.h"
#include "actions.h"
*/
int
-do_mount_vfs (char *options, char *vfstype,
- char *device, char *mountpoint)
+do_mount_vfs (const char *options, const char *vfstype,
+ const char *device, const char *mountpoint)
{
- int len, r, is_root;
+ int r, is_root;
char *mp;
char *error;
- IS_DEVICE (device, -1);
+ ABS_PATH (mountpoint, 0, return -1);
- is_root = strcmp (mountpoint, "/") == 0;
+ is_root = STREQ (mountpoint, "/");
if (!root_mounted && !is_root) {
- reply_with_error ("mount: you must mount something on / first");
+ reply_with_error ("you must mount something on / first");
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);
+ "mount", "-o", options, "-t", vfstype, device, mp, NULL);
else
r = command (NULL, &error,
- "mount", "-o", options, device, mp, NULL);
+ "mount", "-o", options, device, mp, NULL);
free (mp);
if (r == -1) {
- reply_with_error ("mount: %s on %s: %s", device, mountpoint, error);
+ reply_with_error ("%s on %s: %s", device, mountpoint, error);
free (error);
return -1;
}
}
int
-do_mount (char *device, char *mountpoint)
+do_mount (const char *device, const char *mountpoint)
{
return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
}
int
-do_mount_ro (char *device, char *mountpoint)
+do_mount_ro (const char *device, const char *mountpoint)
{
return do_mount_vfs ("ro", NULL, device, mountpoint);
}
int
-do_mount_options (char *options, char *device,
- char *mountpoint)
+do_mount_options (const char *options, const char *device,
+ const char *mountpoint)
{
return do_mount_vfs (options, NULL, device, mountpoint);
}
* is kept updated.
*/
int
-do_umount (char *pathordevice)
+do_umount (const char *pathordevice)
{
- int len, freeit = 0, r;
- char *buf;
+ int r;
char *err;
+ char *buf;
+ int is_dev;
- if (strncmp (pathordevice, "/dev/", 5) == 0) {
- buf = pathordevice;
- IS_DEVICE (buf, -1);
- } 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);
+ is_dev = STREQLEN (pathordevice, "/dev/", 5);
+ buf = is_dev ? strdup (pathordevice)
+ : sysroot_path (pathordevice);
+ if (buf == NULL) {
+ reply_with_perror ("malloc");
+ return -1;
}
+ if (is_dev)
+ RESOLVE_DEVICE (buf, 0, { free (buf); return -1; });
+
r = command (NULL, &err, "umount", buf, NULL);
- if (freeit) free (buf);
+ free (buf);
+
if (r == -1) {
- reply_with_error ("umount: %s: %s", pathordevice, err);
+ reply_with_error ("%s: %s", pathordevice, err);
free (err);
return -1;
}
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) {
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');
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;
+ 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;
- }
+ 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;
+ }
}
}
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) {
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');
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, " ");
*p3 = '\0';
if (add_string (&mounts, &size, &alloc, p2) == -1) {
- free (out);
- return -1;
+ free (out);
+ return -1;
}
}
* device.
*/
int
-do_mount_loop (char *file, char *mountpoint)
+do_mount_loop (const char *file, const char *mountpoint)
{
- int len, r;
+ int r;
char *buf, *mp;
char *error;
- NEED_ROOT (-1);
- 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);
free (buf);
if (r == -1) {
- reply_with_error ("mount: %s on %s: %s", file, mountpoint, error);
+ reply_with_error ("%s on %s: %s", file, mountpoint, error);
free (error);
return -1;
}
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 (const char *path)
+{
+ int r;
+
+ /* NEED_ROOT (return -1); - we don't want this test for this call. */
+ ABS_PATH (path, 0, return -1);
+
+ CHROOT_IN;
+ r = mkdir (path, 0777);
+ CHROOT_OUT;
+
+ if (r == -1) {
+ reply_with_perror ("%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 (const char *path)
+{
+ int r;
+
+ /* NEED_ROOT (return -1); - we don't want this test for this call. */
+ ABS_PATH (path, 0, return -1);
+
+ CHROOT_IN;
+ r = rmdir (path);
+ CHROOT_OUT;
+
+ if (r == -1) {
+ reply_with_perror ("%s", path);
+ return -1;
+ }
+
+ return 0;
+}
git.annexia.org / libguestfs.git / blobdiff