From: Richard Jones <rjones@trick.home.annexia.org>
Date: Thu, 13 Aug 2009 15:41:37 +0000 (+0100)
Subject: umount: Enable device name translation for device parameter.
X-Git-Tag: 1.0.67~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=4556fd64a8e236ec041cc00ed9687ef9bd455812;p=libguestfs.git

umount: Enable device name translation for device parameter.
---

diff --git a/daemon/mount.c b/daemon/mount.c
index f593812..463e789 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -109,15 +109,20 @@ 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 = strncmp (pathordevice, "/dev/", 5) == 0;
+  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);
   free (buf);