git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40a0f25
)
umount: Enable device name translation for device parameter.
author
Richard Jones
<rjones@trick.home.annexia.org>
Thu, 13 Aug 2009 15:41:37 +0000
(16:41 +0100)
committer
Richard Jones
<rjones@trick.home.annexia.org>
Thu, 13 Aug 2009 15:41:37 +0000
(16:41 +0100)
daemon/mount.c
patch
|
blob
|
history
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
f593812
..
463e789
100644
(file)
--- 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);