Skip to content

Commit 3f56e2a

Browse files
authored
Merge pull request #543 from rhatdan/recursion
Recursive propagation flags should be legal to use
2 parents d445714 + 9bcbe83 commit 3f56e2a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

generate/generate.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,11 +891,15 @@ func (g *Generator) SetLinuxRootPropagation(rp string) error {
891891
switch rp {
892892
case "":
893893
case "private":
894+
case "rprivate":
894895
case "slave":
896+
case "rslave":
895897
case "shared":
898+
case "rshared":
896899
case "unbindable":
900+
case "runbindable":
897901
default:
898-
return fmt.Errorf("rootfs-propagation must be empty or one of private|slave|shared|unbindable")
902+
return fmt.Errorf("rootfs-propagation %q must be empty or one of (r)private|(r)slave|(r)shared|(r)unbindable", rp)
899903
}
900904
g.initSpecLinux()
901905
g.spec.Linux.RootfsPropagation = rp

0 commit comments

Comments
 (0)