X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=ccd07c6bacd9143362dae5a6019df26287e64ca5;hp=4f74c02866fd886f17343c1dfdd9128c66beae86;hb=4d900cdac8258daa2e99c6ceb2a4985154e94150;hpb=a0bb8e69de762aa88144c7a4825e13c446c2bbcb

diff --git a/daemon/mount.c b/daemon/mount.c
index 4f74c02..ccd07c6 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -48,10 +48,12 @@ do_mount_vfs (const char *options, const char *vfstype,
   char *mp;
   char *error;
 
-  is_root = strcmp (mountpoint, "/") == 0;
+  ABS_PATH (mountpoint, 0, 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;
   }
 
@@ -69,7 +71,7 @@ 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;
   }
@@ -107,20 +109,25 @@ 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;
   }
@@ -142,6 +149,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 +205,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;
 }
 
@@ -331,7 +359,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;
   }
@@ -349,14 +377,14 @@ 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;
   }
 
@@ -373,12 +401,15 @@ 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 ("rmmountpoint: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }