From 9bcbe8305740adfe190fb3d0e7caf7a2ed3a68a6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 15 Dec 2017 07:08:44 -0500 Subject: [PATCH] Recursive propagation flags should be legal to use Current root propagation code does not allow rslave, rshared, runbindable and rprivate. These are all legal proagations and should be allowed. Also added the "bad" propagation flag to the error to make diagnosis easier. Signed-off-by: Daniel J Walsh --- generate/generate.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generate/generate.go b/generate/generate.go index 3a19e32cd..91957edc6 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -891,11 +891,15 @@ func (g *Generator) SetLinuxRootPropagation(rp string) error { switch rp { case "": case "private": + case "rprivate": case "slave": + case "rslave": case "shared": + case "rshared": case "unbindable": + case "runbindable": default: - return fmt.Errorf("rootfs-propagation must be empty or one of private|slave|shared|unbindable") + return fmt.Errorf("rootfs-propagation %q must be empty or one of (r)private|(r)slave|(r)shared|(r)unbindable", rp) } g.initSpecLinux() g.spec.Linux.RootfsPropagation = rp