git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add caution subdirectory containing safety and liveness tests.
[libguestfs.git]
/
daemon
/
mount.c
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
250656a
..
128b05b
100644
(file)
--- a/
daemon/mount.c
+++ b/
daemon/mount.c
@@
-48,7
+48,7
@@
do_mount_vfs (const char *options, const char *vfstype,
char *mp;
char *error;
char *mp;
char *error;
- ABS_PATH (mountpoint,
0
, return -1);
+ ABS_PATH (mountpoint, , return -1);
is_root = STREQ (mountpoint, "/");
is_root = STREQ (mountpoint, "/");
@@
-79,6
+79,7
@@
do_mount_vfs (const char *options, const char *vfstype,
if (is_root)
root_mounted = 1;
if (is_root)
root_mounted = 1;
+ free (error);
return 0;
}
return 0;
}
@@
-121,7
+122,7
@@
do_umount (const char *pathordevice)
}
if (is_dev)
}
if (is_dev)
- RESOLVE_DEVICE (buf,
0
, { free (buf); return -1; });
+ RESOLVE_DEVICE (buf, , { free (buf); return -1; });
r = command (NULL, &err, "umount", buf, NULL);
free (buf);
r = command (NULL, &err, "umount", buf, NULL);
free (buf);
@@
-324,9
+325,6
@@
do_umount_all (void)
free_stringslen (mounts, size);
free_stringslen (mounts, size);
- /* Without this, lvm_remove_all was failing on Ubuntu. */
- udev_settle ();
-
/* We've unmounted root now, so ... */
root_mounted = 0;
/* We've unmounted root now, so ... */
root_mounted = 0;
@@
-352,7
+350,7
@@
do_mount_loop (const char *file, const char *mountpoint)
}
buf = sysroot_path (file);
}
buf = sysroot_path (file);
- if (!
file
) {
+ if (!
buf
) {
reply_with_perror ("malloc");
free (mp);
return -1;
reply_with_perror ("malloc");
free (mp);
return -1;
@@
-367,6
+365,7
@@
do_mount_loop (const char *file, const char *mountpoint)
return -1;
}
return -1;
}
+ free (error);
return 0;
}
return 0;
}
@@
-380,7
+379,7
@@
do_mkmountpoint (const char *path)
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
- ABS_PATH (path,
0
, return -1);
+ ABS_PATH (path, , return -1);
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_IN;
r = mkdir (path, 0777);
@@
-405,7
+404,7
@@
do_rmmountpoint (const char *path)
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
- ABS_PATH (path,
0
, return -1);
+ ABS_PATH (path, , return -1);
CHROOT_IN;
r = rmdir (path);
CHROOT_IN;
r = rmdir (path);