git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update generator to emit each RESOLVE_DEVICE call
[libguestfs.git]
/
daemon
/
mount.c
diff --git
a/daemon/mount.c
b/daemon/mount.c
index
9754ca9
..
8cf6874
100644
(file)
--- a/
daemon/mount.c
+++ b/
daemon/mount.c
@@
-48,7
+48,7
@@
do_mount_vfs (char *options, char *vfstype,
char *mp;
char *error;
char *mp;
char *error;
-
IS_DEVICE (device,
-1);
+
RESOLVE_DEVICE (device, return
-1);
is_root = strcmp (mountpoint, "/") == 0;
is_root = strcmp (mountpoint, "/") == 0;
@@
-113,7
+113,7
@@
do_umount (char *pathordevice)
if (strncmp (pathordevice, "/dev/", 5) == 0) {
buf = pathordevice;
if (strncmp (pathordevice, "/dev/", 5) == 0) {
buf = pathordevice;
-
IS_DEVICE (buf,
-1);
+
RESOLVE_DEVICE (buf, return
-1);
} else {
buf = sysroot_path (pathordevice);
if (buf == NULL) {
} else {
buf = sysroot_path (pathordevice);
if (buf == NULL) {
@@
-320,7
+320,7
@@
do_mount_loop (char *file, char *mountpoint)
char *error;
NEED_ROOT (-1);
char *error;
NEED_ROOT (-1);
- ABS_PATH (file, -1);
+ ABS_PATH (file,
return
-1);
/* We have to prefix /sysroot on both the filename and the mountpoint. */
mp = sysroot_path (mountpoint);
/* We have to prefix /sysroot on both the filename and the mountpoint. */
mp = sysroot_path (mountpoint);
@@
-358,7
+358,7
@@
do_mkmountpoint (char *path)
int r;
/* NEED_ROOT (-1); - we don't want this test for this call. */
int r;
/* NEED_ROOT (-1); - we don't want this test for this call. */
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = mkdir (path, 0777);
CHROOT_IN;
r = mkdir (path, 0777);
@@
-383,7
+383,7
@@
do_rmmountpoint (char *path)
int r;
NEED_ROOT (-1);
int r;
NEED_ROOT (-1);
- ABS_PATH (path, -1);
+ ABS_PATH (path,
return
-1);
CHROOT_IN;
r = rmdir (path);
CHROOT_IN;
r = rmdir (path);