diff options
| -rw-r--r-- | cmd/podman/common.go | 2 | ||||
| -rw-r--r-- | cmd/podman/create.go | 4 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 2 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index f647f9c4d..ef7463773 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -250,7 +250,7 @@ var createFlags = []cli.Flag{ }, cli.StringFlag{ Name: "mac-address", - Usage: "Container MAC address (e.g. 92:d0:c6:0a:29:33)", + Usage: "Container MAC address (e.g. 92:d0:c6:0a:29:33), not currently supported", }, cli.StringFlag{ Name: "memory, m", diff --git a/cmd/podman/create.go b/cmd/podman/create.go index f147081d4..6fe68ebab 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -305,6 +305,10 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim return nil, err } + if c.String("mac-address") != "" { + return nil, errors.Errorf("--mac-address option not currently supported") + } + imageID := "" inputCommand = c.Args()[1:] diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index ed20c6f8d..dc0b0375d 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -332,6 +332,8 @@ Remember that the MAC address in an Ethernet network must be unique. The IPv6 link-local address will be based on the device's MAC address according to RFC4862. +Not currently supported + **-m**, **--memory**="" Memory limit (format: <number>[<unit>], where unit = b, k, m or g) diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index a049a33aa..00c78f321 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -346,6 +346,8 @@ Remember that the MAC address in an Ethernet network must be unique. The IPv6 link-local address will be based on the device's MAC address according to RFC4862. +Not currently supported + **-m**, **--memory**="" Memory limit (format: <number>[<unit>], where unit = b, k, m or g) |