summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-12-18 13:53:42 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-12-18 21:19:30 +0000
commit34572abc707f2684cfcbfb64222497aeb842d662 (patch)
tree53d6190c5cb9d9142bdd18627fda2437c5ae7f14 /cmd/podman
parent5770dc2640c216525ab84031e3712fcc46b3b087 (diff)
downloadpodman-34572abc707f2684cfcbfb64222497aeb842d662.tar.gz
podman-34572abc707f2684cfcbfb64222497aeb842d662.tar.bz2
podman-34572abc707f2684cfcbfb64222497aeb842d662.zip
Vendor in latest storage, image and runtime-tools
Need to pull in the latest containers/storage and containers/image to fix lots of issues. Also want to update runtime-tools to take advantage of newer generate code. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #152 Approved by: rhatdan
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/spec.go2
-rw-r--r--cmd/podman/spec_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/spec.go b/cmd/podman/spec.go
index adfdf7347..b13556d93 100644
--- a/cmd/podman/spec.go
+++ b/cmd/podman/spec.go
@@ -483,7 +483,7 @@ func (c *createConfig) GetVolumeMounts() ([]spec.Mount, error) {
}
}
if rootProp == "" {
- options = append(options, "rprivate")
+ options = append(options, "private")
}
m = append(m, spec.Mount{
diff --git a/cmd/podman/spec_test.go b/cmd/podman/spec_test.go
index 01e1a4ad3..586c09656 100644
--- a/cmd/podman/spec_test.go
+++ b/cmd/podman/spec_test.go
@@ -13,7 +13,7 @@ func TestCreateConfig_GetVolumeMounts(t *testing.T) {
Destination: "/foobar",
Type: "bind",
Source: "foobar",
- Options: []string{"ro", "rbind", "rprivate"},
+ Options: []string{"ro", "rbind", "private"},
}
config := createConfig{
Volumes: []string{"foobar:/foobar:ro"},