Richard W.M. Jones
2009-Aug-13 15:44 UTC
[Libguestfs] [PATCH] Enable device name translation for umount /dev
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 2001From: 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
Richard W.M. Jones
2009-Aug-13 16:25 UTC
[Libguestfs] [PATCH] Enable device name translation for umount /dev
On Thu, Aug 13, 2009 at 04:44:38PM +0100, Richard W.M. Jones wrote:> 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.I verified that this fixed the 3 tests, so pushed. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
Apparently Analagous Threads
- [PATCH 0/3] Three code cleanups
- [PATCH] Correct checks for dup failure in guestfs_launch
- [PATCH febootstrap 0/8] Add support for building an ext2-based appliance
- [PATCH] Fix verbose packet dumping functions.
- [PATCH 0/3] Add support for recursively deleting nodes