X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=14e683afd1d07d766247d518e9dc3468b7f7098a;hp=1820f8a8e4b79ea2a9b1a1987a77bb55adad5464;hb=0c07f0d23698798475e0d09491812aca52440328;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf diff --git a/daemon/mount.c b/daemon/mount.c index 1820f8a..14e683a 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include "daemon.h" #include "actions.h" @@ -40,14 +42,12 @@ int root_mounted = 0; int do_mount_vfs (char *options, char *vfstype, - char *device, char *mountpoint) + char *device, char *mountpoint) { - int len, r, is_root; + int r, is_root; char *mp; char *error; - IS_DEVICE (device, -1); - is_root = strcmp (mountpoint, "/") == 0; if (!root_mounted && !is_root) { @@ -55,22 +55,18 @@ 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); + "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); @@ -98,7 +94,7 @@ do_mount_ro (char *device, char *mountpoint) int do_mount_options (char *options, char *device, - char *mountpoint) + char *mountpoint) { return do_mount_vfs (options, NULL, device, mountpoint); } @@ -109,22 +105,20 @@ 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; if (strncmp (pathordevice, "/dev/", 5) == 0) { buf = pathordevice; - IS_DEVICE (buf, -1); + RESOLVE_DEVICE (buf, return -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 +136,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 +157,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,15 +170,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; + } } } @@ -192,6 +204,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 +244,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 +256,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,17 +269,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; } } @@ -286,30 +313,26 @@ do_umount_all (void) int do_mount_loop (char *file, char *mountpoint) { - int len, r; + int r; char *buf, *mp; char *error; NEED_ROOT (-1); - ABS_PATH (file, -1); + ABS_PATH (file, return -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 +345,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, return -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, return -1); + + CHROOT_IN; + r = rmdir (path); + CHROOT_OUT; + + if (r == -1) { + reply_with_perror ("rmmountpoint: %s", path); + return -1; + } + + return 0; +}