diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-08-13 16:41:37 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-08-13 16:41:37 +0100 |
| commit | 4556fd64a8e236ec041cc00ed9687ef9bd455812 (patch) | |
| tree | e8c11208df0d9fd39847f0d06dc839d28fbf41da | |
| parent | 40a0f2595515b5624ddd93cf26c4ed6383ac530e (diff) | |
| download | libguestfs-4556fd64a8e236ec041cc00ed9687ef9bd455812.tar.gz libguestfs-4556fd64a8e236ec041cc00ed9687ef9bd455812.tar.xz libguestfs-4556fd64a8e236ec041cc00ed9687ef9bd455812.zip | |
umount: Enable device name translation for device parameter.
| -rw-r--r-- | daemon/mount.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/daemon/mount.c b/daemon/mount.c index f5938121..463e789f 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); |