[Libguestfs] [PATCH] Enable device name translation for umount /dev

[Richard W.M. Jones]

OK, I believe this is the cause of the 3 related failures
on CentOS / RHEL.

Calls to guestfs_umount ("/dev/...") didn't have the device
path being rewritten.

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
>From 4556fd64a8e236ec041cc00ed9687ef9bd455812 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Thu, 13 Aug 2009 16:41:37 +0100
Subject: [PATCH] umount: Enable device name translation for device parameter.

---
 daemon/mount.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

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);
 
-- 
1.6.2.5