X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=be289dade5865327f65bea16481c733c318b1173;hp=8cf6874945fdbe9c9f1958c60c5b9d4ea806394e;hb=7f16c346bbeba2f2fe3c31ccb85158178a284d84;hpb=0dd6c8c8442d4ff588f6dac2efab24d3409b0dec diff --git a/daemon/mount.c b/daemon/mount.c index 8cf6874..be289da 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -24,12 +24,46 @@ #include #include #include +#include #include "daemon.h" #include "actions.h" -/* You must mount something on "/" first, hence: */ -int root_mounted = 0; +/* You must mount something on "/" first before many operations. + * Hence we have an internal function which can test if something is + * mounted on *or under* the sysroot directory. (It has to be *or + * under* because of mkmountpoint and friends). + */ +int +is_root_mounted (void) +{ + FILE *fp; + struct mntent *m; + + /* NB: Eventually we should aim to parse /proc/self/mountinfo, but + * that requires custom parsing code. + */ + fp = setmntent ("/proc/mounts", "r"); + if (fp == NULL) { + perror ("/proc/mounts"); + exit (EXIT_FAILURE); + } + + while ((m = getmntent (fp)) != NULL) { + /* Allow a mount directory like "/sysroot". */ + if (sysroot_len > 0 && STREQ (m->mnt_dir, sysroot)) { + gotit: + endmntent (fp); + return 1; + } + /* Or allow a mount directory like "/sysroot/...". */ + if (STRPREFIX (m->mnt_dir, sysroot) && m->mnt_dir[sysroot_len] == '/') + goto gotit; + } + + endmntent (fp); + return 0; +} /* The "simple mount" call offers no complex options, you can just * mount a device on a mountpoint. The variations like mount_ro, @@ -41,21 +75,15 @@ int root_mounted = 0; */ 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 r, is_root; + int r; char *mp; char *error; + struct stat statbuf; - RESOLVE_DEVICE (device, return -1); - - is_root = strcmp (mountpoint, "/") == 0; - - if (!root_mounted && !is_root) { - reply_with_error ("mount: you must mount something on / first"); - return -1; - } + ABS_PATH (mountpoint, , return -1); mp = sysroot_path (mountpoint); if (!mp) { @@ -63,6 +91,18 @@ do_mount_vfs (char *options, char *vfstype, return -1; } + /* Check the mountpoint exists and is a directory. */ + if (stat (mp, &statbuf) == -1) { + reply_with_perror ("mount: %s", mountpoint); + free (mp); + return -1; + } + if (!S_ISDIR (statbuf.st_mode)) { + reply_with_perror ("mount: %s: mount point is not a directory", mountpoint); + free (mp); + return -1; + } + if (vfstype) r = command (NULL, &error, "mount", "-o", options, "-t", vfstype, device, mp, NULL); @@ -71,32 +111,30 @@ do_mount_vfs (char *options, char *vfstype, "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; } - if (is_root) - root_mounted = 1; - + free (error); return 0; } 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); } @@ -105,104 +143,105 @@ do_mount_options (char *options, char *device, * is kept updated. */ int -do_umount (char *pathordevice) +do_umount (const char *pathordevice) { - int freeit = 0, r; - char *buf; + int r; char *err; + char *buf; + int is_dev; - if (strncmp (pathordevice, "/dev/", 5) == 0) { - buf = pathordevice; - RESOLVE_DEVICE (buf, return -1); - } else { - buf = sysroot_path (pathordevice); - if (buf == NULL) { - reply_with_perror ("malloc"); - return -1; - } - freeit = 1; + 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; } free (err); - /* update root_mounted? */ - return 0; } +/* Implement 'mounts' (mp==0) and 'mountpoints' (mp==1) calls. */ static char ** mounts_or_mountpoints (int mp) { - char *out, *err; - int r; + FILE *fp; + struct mntent *m; 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) { - reply_with_error ("mount: %s", err); - free (out); - free (err); - return NULL; - } - - free (err); + size_t i; + int r; - /* Lines have the format: - * /dev/foo on /mountpoint type ... + /* NB: Eventually we should aim to parse /proc/self/mountinfo, but + * that requires custom parsing code. */ - snprintf (matching, 5 + sysroot_len, " on %s", sysroot); - - p = out; - while (p) { - pend = strchr (p, '\n'); - if (pend) { - *pend = '\0'; - pend++; - } + fp = setmntent ("/proc/mounts", "r"); + if (fp == NULL) { + perror ("/proc/mounts"); + exit (EXIT_FAILURE); + } - p2 = strstr (p, matching); - if (p2 != NULL) { - *p2 = '\0'; - if (add_string (&ret, &size, &alloc, p) == -1) { - free (out); + while ((m = getmntent (fp)) != NULL) { + /* Allow a mount directory like "/sysroot". */ + if (sysroot_len > 0 && STREQ (m->mnt_dir, sysroot)) { + if (add_string (&ret, &size, &alloc, m->mnt_fsname) == -1) { + error: + endmntent (fp); 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; - } - } + if (mp && + add_string (&ret, &size, &alloc, "/") == -1) + goto error; + } + /* Or allow a mount directory like "/sysroot/...". */ + if (STRPREFIX (m->mnt_dir, sysroot) && m->mnt_dir[sysroot_len] == '/') { + if (add_string (&ret, &size, &alloc, m->mnt_fsname) == -1) + goto error; + if (mp && + add_string (&ret, &size, &alloc, &m->mnt_dir[sysroot_len]) == -1) + goto error; } - - p = pend; } - free (out); + endmntent (fp); if (add_string (&ret, &size, &alloc, NULL) == -1) return NULL; + /* Convert /dev/mapper LV paths into canonical paths (RHBZ#646432). */ + for (i = 0; ret[i] != NULL; i += mp ? 2 : 1) { + if (STRPREFIX (ret[i], "/dev/mapper/") || STRPREFIX (ret[i], "/dev/dm-")) { + char *canonical; + r = lv_canonical (ret[i], &canonical); + if (r == -1) { + free_strings (ret); + return NULL; + } + if (r == 1) { + free (ret[i]); + ret[i] = canonical; + } + /* Ignore the case where r == 0. This might happen where + * eg. a LUKS /dev/mapper device is mounted, but that won't + * correspond to any LV. + */ + } + } + return ret; } @@ -241,50 +280,40 @@ compare_longest_first (const void *vp1, const void *vp2) int do_umount_all (void) { - char *out, *err; - int i, r; + FILE *fp; + struct mntent *m; char **mounts = NULL; int size = 0, alloc = 0; - char *p, *p2, *p3, *pend; - char matching[5 + sysroot_len]; + char *err; + int i, r; - r = command (&out, &err, "mount", NULL); - if (r == -1) { - reply_with_error ("mount: %s", err); - free (out); - free (err); - return -1; + /* NB: Eventually we should aim to parse /proc/self/mountinfo, but + * that requires custom parsing code. + */ + fp = setmntent ("/proc/mounts", "r"); + if (fp == NULL) { + perror ("/proc/mounts"); + exit (EXIT_FAILURE); } - 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'); - if (pend) { - *pend = '\0'; - pend++; + while ((m = getmntent (fp)) != NULL) { + /* Allow a mount directory like "/sysroot". */ + if (sysroot_len > 0 && STREQ (m->mnt_dir, sysroot)) { + if (add_string (&mounts, &size, &alloc, m->mnt_dir) == -1) { + endmntent (fp); + return -1; + } } - - 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); + /* Or allow a mount directory like "/sysroot/...". */ + if (STRPREFIX (m->mnt_dir, sysroot) && m->mnt_dir[sysroot_len] == '/') { + if (add_string (&mounts, &size, &alloc, m->mnt_dir) == -1) { + endmntent (fp); return -1; } } - - p = pend; } - free (out); + + endmntent (fp); qsort (mounts, size, sizeof (char *), compare_longest_first); @@ -302,9 +331,6 @@ do_umount_all (void) free_stringslen (mounts, size); - /* We've unmounted root now, so ... */ - root_mounted = 0; - return 0; } @@ -313,15 +339,12 @@ do_umount_all (void) * device. */ int -do_mount_loop (char *file, char *mountpoint) +do_mount_loop (const char *file, const char *mountpoint) { int r; char *buf, *mp; char *error; - NEED_ROOT (-1); - ABS_PATH (file, return -1); - /* We have to prefix /sysroot on both the filename and the mountpoint. */ mp = sysroot_path (mountpoint); if (!mp) { @@ -330,7 +353,7 @@ do_mount_loop (char *file, char *mountpoint) } buf = sysroot_path (file); - if (!file) { + if (!buf) { reply_with_perror ("malloc"); free (mp); return -1; @@ -340,57 +363,53 @@ do_mount_loop (char *file, char *mountpoint) 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; } + free (error); 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. + * variations on mkdir and rmdir which do no checking of the + * is_root_mounted() flag. */ int -do_mkmountpoint (char *path) +do_mkmountpoint (const char *path) { int r; - /* NEED_ROOT (-1); - we don't want this test for this call. */ - ABS_PATH (path, return -1); + /* 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 ("mkmountpoint: %s", path); + 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 (char *path) +do_rmmountpoint (const char *path) { int r; - NEED_ROOT (-1); - ABS_PATH (path, return -1); + /* 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 ("rmmountpoint: %s", path); + reply_with_perror ("%s", path); return -1; }