veyron/tools/mounttable: Pass the M and R options correctly.
The M and R mount options were parsed correctly, but never passed to the
Mount method.
Change-Id: I9d3819b4133850c1da897b7e26684e81afc3b52f
diff --git a/tools/mounttable/doc.go b/tools/mounttable/doc.go
index 3b89c09..97f82c8 100644
--- a/tools/mounttable/doc.go
+++ b/tools/mounttable/doc.go
@@ -71,12 +71,17 @@
Mounts a server <name> onto a mount table
Usage:
- mounttable mount <mount name> <name> <ttl>
+ mounttable mount <mount name> <name> <ttl> [M|R]
-<mount name> is a mount name on a mount table. <name> is the rooted object name
-of the server. <ttl> is the TTL of the new entry. It is a decimal number
-followed by a unit suffix (s, m, h). A value of 0s represents an infinite
-duration.
+<mount name> is a mount name on a mount table.
+
+<name> is the rooted object name of the server.
+
+<ttl> is the TTL of the new entry. It is a decimal number followed by a unit
+suffix (s, m, h). A value of 0s represents an infinite duration.
+
+[M|R] are mount options. M indicates that <name> is a mounttable. R indicates
+that existing entries should be removed.
Mounttable Unmount
diff --git a/tools/mounttable/impl.go b/tools/mounttable/impl.go
index 5046a09..a62157c 100644
--- a/tools/mounttable/impl.go
+++ b/tools/mounttable/impl.go
@@ -69,12 +69,17 @@
Name: "mount",
Short: "Mounts a server <name> onto a mount table",
Long: "Mounts a server <name> onto a mount table",
- ArgsName: "<mount name> <name> <ttl>",
+ ArgsName: "<mount name> <name> <ttl> [M|R]",
ArgsLong: `
<mount name> is a mount name on a mount table.
+
<name> is the rooted object name of the server.
+
<ttl> is the TTL of the new entry. It is a decimal number followed by a unit
suffix (s, m, h). A value of 0s represents an infinite duration.
+
+[M|R] are mount options. M indicates that <name> is a mounttable. R indicates
+that existing entries should be removed.
`,
}
@@ -105,7 +110,7 @@
ctx, cancel := context.WithTimeout(gctx, time.Minute)
defer cancel()
client := veyron2.GetClient(ctx)
- call, err := client.StartCall(ctx, args[0], "Mount", []interface{}{args[1], seconds, 0}, options.NoResolve{})
+ call, err := client.StartCall(ctx, args[0], "Mount", []interface{}{args[1], seconds, flags}, options.NoResolve{})
if err != nil {
return err
}
