X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmount.c;h=49a0eab0a04f969a3816fc029d736de871933558;hp=4f74c02866fd886f17343c1dfdd9128c66beae86;hb=e94f89f40d989d111882178c87b5bfc22314fca8;hpb=a0bb8e69de762aa88144c7a4825e13c446c2bbcb

diff --git a/daemon/mount.c b/daemon/mount.c
index 4f74c02..49a0eab 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -48,7 +48,9 @@ do_mount_vfs (const char *options, const char *vfstype,
   char *mp;
   char *error;
 
-  is_root = strcmp (mountpoint, "/") == 0;
+  ABS_PATH (mountpoint, return -1);
+
+  is_root = STREQ (mountpoint, "/");
 
   if (!root_mounted && !is_root) {
     reply_with_error ("mount: you must mount something on / first");
@@ -107,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 = STREQLEN (pathordevice, "/dev/", 5);
+  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);
 
@@ -373,6 +380,9 @@ do_rmmountpoint (const char *path)
 {
   int r;
 
+  /* NEED_ROOT (return -1); - we don't want this test for this call. */
+  ABS_PATH (path, return -1);
+
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;