X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=0c990c3192b233b63c2322f352923a1d16cf530d;hb=7fb25f53f836172376c25b405b5f88f4ec37eed8;hp=d1b26fa7b0c9630d957e77dfbb36149c0a5d4d6f;hpb=dcd67e2c4e81bb270ea7f5ed8b6675b114afca60;p=libguestfs.git diff --git a/daemon/mount.c b/daemon/mount.c index d1b26fa..0c990c3 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, @@ -44,16 +78,12 @@ int 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; - 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, 0, return -1); mp = sysroot_path (mountpoint); if (!mp) { @@ -61,6 +91,18 @@ do_mount_vfs (const char *options, const 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); @@ -69,14 +111,11 @@ do_mount_vfs (const char *options, const 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; - return 0; } @@ -107,28 +146,31 @@ do_umount (const char *pathordevice) { int r; char *err; + char *buf; + int is_dev; - char *buf = (strncmp (pathordevice, "/dev/", 5) == 0 - ? strdup (pathordevice) - : sysroot_path (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); 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; } @@ -142,6 +184,7 @@ mounts_or_mountpoints (int mp) char *p, *pend, *p2; int len; char matching[5 + sysroot_len]; + size_t i; r = command (&out, &err, "mount", NULL); if (r == -1) { @@ -197,6 +240,26 @@ mounts_or_mountpoints (int mp) 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; } @@ -296,9 +359,6 @@ do_umount_all (void) free_stringslen (mounts, size); - /* We've unmounted root now, so ... */ - root_mounted = 0; - return 0; } @@ -331,7 +391,7 @@ do_mount_loop (const char *file, const 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; } @@ -340,8 +400,8 @@ do_mount_loop (const char *file, const char *mountpoint) } /* 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 (const char *path) @@ -349,22 +409,17 @@ 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); + ABS_PATH (path, 0, 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; } @@ -374,14 +429,14 @@ 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); + ABS_PATH (path, 0, 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; }