mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

do_umount: don't use RESOLVE_DEVICE anymore

Browse Source 
* daemon/mount.c (do_umount): Don't use RESOLVE_DEVICE here,
now that the caller always invokes REQUIRE_ROOT_OR_RESOLVE_DEVICE.
This commit is contained in:
Jim Meyering
2009-08-12 09:49:24 +02:00
parent 3a5a66de8f
commit a0bb8e69de
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/mount.c
View File

@@ -105,24 +105,20 @@ do_mount_options (const char *options, const char *device,
int
do_umount (const char *pathordevice)
{
int freeit = 0, r;
char *buf;
int r;
char *err;
if (strncmp (pathordevice, "/dev/", 5) == 0) {
buf = pathordevice;
RESOLVE_DEVICE (buf, return -1);
} else {
buf = sysroot_path (pathordevice);
if (buf == NULL) {
reply_with_perror ("malloc");
return -1;
}
freeit = 1;
char *buf = (strncmp (pathordevice, "/dev/", 5) == 0
? strdup (pathordevice)
: sysroot_path (pathordevice));
if (buf == NULL) {
reply_with_perror ("malloc");
return -1;
}
r = command (NULL, &err, "umount", buf, NULL);
if (freeit) free (buf);
free (buf);
if (r == -1) {
reply_with_error ("umount: %s: %s", pathordevice, err);
free (err);