diff options
| author | Wanlong Gao <gaowanlong@cn.fujitsu.com> | 2012-07-24 16:47:23 +0800 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-07-24 13:01:08 +0100 |
| commit | d8b2c1afee4e23ca864727bebc53a04c490715bc (patch) | |
| tree | 6fcca62ef31ea93e979e7f1c1b1a86a68b5f326d | |
| parent | c03cdcc25ca9b4d2169f5566ea1470758caef812 (diff) | |
| download | libguestfs-d8b2c1afee4e23ca864727bebc53a04c490715bc.tar.gz libguestfs-d8b2c1afee4e23ca864727bebc53a04c490715bc.tar.xz libguestfs-d8b2c1afee4e23ca864727bebc53a04c490715bc.zip | |
umount: use Dev_or_Path for the argument type
Use Dev_or_Path instead of String.
Remove the RESOLVE_DEVICE since Dev_or_Path will generate
REQUIRE_ROOT_OR_RESOLVE_DEVICE instead.
RWMJ:
Note a change in semantics: this now requires root. However this is
OK and still works with mkmountpoint and friends because
'is_root_mounted' works even if something is mounted below the root.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
| -rw-r--r-- | daemon/mount.c | 3 | ||||
| -rw-r--r-- | generator/generator_actions.ml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/daemon/mount.c b/daemon/mount.c index b5b932d8..bd27f94c 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -205,9 +205,6 @@ do_umount (const char *pathordevice, return -1; } - if (is_dev) - RESOLVE_DEVICE (buf, , { free (buf); return -1; }); - if (!(optargs_bitmask & GUESTFS_UMOUNT_FORCE_BITMASK)) force = 0; if (!(optargs_bitmask & GUESTFS_UMOUNT_LAZYUNMOUNT_BITMASK)) diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index 0adcf293..ecb2e8cd 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -2772,7 +2772,7 @@ characters does I<not> work, even if the length is specified." }; { defaults with name = "umount"; - style = RErr, [String "pathordevice"], [OBool "force"; OBool "lazyunmount"]; + style = RErr, [Dev_or_Path "pathordevice"], [OBool "force"; OBool "lazyunmount"]; proc_nr = Some 45; fish_alias = ["unmount"]; once_had_no_optargs = true; |