summaryrefslogtreecommitdiff
path: root/pkg/spec
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-06-13 11:28:24 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-06-13 15:32:45 +0200
commit23efe4cb819b9fb306155ab25db7e2459aba63bb (patch)
tree03b9943dfd5a36e942be6f2ca46a84daf0408d2e /pkg/spec
parent97f4818ce1e09dd56dc2be820930924e870827e9 (diff)
downloadpodman-23efe4cb819b9fb306155ab25db7e2459aba63bb.tar.gz
podman-23efe4cb819b9fb306155ab25db7e2459aba63bb.tar.bz2
podman-23efe4cb819b9fb306155ab25db7e2459aba63bb.zip
storage: support --mount type=bind,bind-nonrecursive
add support for not recursive bind mounts. Closes: https://github.com/containers/libpod/issues/3314 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/spec')
-rw-r--r--pkg/spec/storage.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go
index 056f004ca..283585ef8 100644
--- a/pkg/spec/storage.go
+++ b/pkg/spec/storage.go
@@ -403,6 +403,8 @@ func getBindMount(args []string) (spec.Mount, error) {
for _, val := range args {
kv := strings.Split(val, "=")
switch kv[0] {
+ case "bind-nonrecursive":
+ newMount.Options = append(newMount.Options, "bind")
case "ro", "nosuid", "nodev", "noexec":
// TODO: detect duplication of these options.
// (Is this necessary?)
@@ -574,7 +576,7 @@ func ValidateVolumeCtrDir(ctrDir string) error {
// ValidateVolumeOpts validates a volume's options
func ValidateVolumeOpts(options []string) error {
- var foundRootPropagation, foundRWRO, foundLabelChange int
+ var foundRootPropagation, foundRWRO, foundLabelChange, bindType int
for _, opt := range options {
switch opt {
case "rw", "ro":
@@ -592,6 +594,11 @@ func ValidateVolumeOpts(options []string) error {
if foundRootPropagation > 1 {
return errors.Errorf("invalid options %q, can only specify 1 '[r]shared', '[r]private' or '[r]slave' option", strings.Join(options, ", "))
}
+ case "bind", "rbind":
+ bindType++
+ if bindType > 1 {
+ return errors.Errorf("invalid options %q, can only specify 1 '[r]bind' option", strings.Join(options, ", "))
+ }
default:
return errors.Errorf("invalid option type %q", opt)
}