X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=838bef8620f4248a26e65bd466422bc5f650e423;hp=4e0ecdbac0e2ea35679888c989546fda54d0c662;hb=de7ef2a0fdcbcddfd35ecb8ee2804e1ca0968454;hpb=e4733575efff31742444b180cdcfbc2504b144c8 diff --git a/daemon/mount.c b/daemon/mount.c index 4e0ecdb..838bef8 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -1,5 +1,5 @@ /* 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 @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include "daemon.h" #include "actions.h" @@ -40,37 +42,36 @@ int root_mounted = 0; int do_mount_vfs (const char *options, const char *vfstype, - const char *device, const char *mountpoint) + const char *device, const char *mountpoint) { - int len, r, is_root; + int r, is_root; char *mp; char *error; - is_root = strcmp (mountpoint, "/") == 0; + ABS_PATH (mountpoint, return -1); + + 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; } @@ -95,7 +96,7 @@ do_mount_ro (const char *device, const char *mountpoint) int do_mount_options (const char *options, const char *device, - const char *mountpoint) + const char *mountpoint) { return do_mount_vfs (options, NULL, device, mountpoint); } @@ -106,27 +107,27 @@ do_mount_options (const char *options, const char *device, int 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 = (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); + 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, { 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; } @@ -138,14 +139,16 @@ do_umount (const 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) { @@ -157,6 +160,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'); @@ -165,15 +173,26 @@ 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; + 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; + } } } @@ -188,6 +207,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 @@ -216,6 +247,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) { @@ -227,6 +259,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'); @@ -235,17 +272,14 @@ 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, " "); *p3 = '\0'; if (add_string (&mounts, &size, &alloc, p2) == -1) { - free (out); - return -1; + free (out); + return -1; } } @@ -274,3 +308,89 @@ do_umount_all (void) return 0; } + +/* Mount using the loopback device. You can't use the generic + * do_mount call for this because the first parameter isn't a + * device. + */ +int +do_mount_loop (const char *file, const char *mountpoint) +{ + int r; + char *buf, *mp; + char *error; + + /* We have to prefix /sysroot on both the filename and the mountpoint. */ + mp = sysroot_path (mountpoint); + if (!mp) { + reply_with_perror ("malloc"); + return -1; + } + + buf = sysroot_path (file); + if (!file) { + reply_with_perror ("malloc"); + free (mp); + return -1; + } + + r = command (NULL, &error, "mount", "-o", "loop", buf, mp, NULL); + free (mp); + free (buf); + if (r == -1) { + 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, 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, return -1); + + CHROOT_IN; + r = rmdir (path); + CHROOT_OUT; + + if (r == -1) { + reply_with_perror ("%s", path); + return -1; + } + + return 0; +}