Merge pull request #484 from q384566678/fix-rootfs-propagation

fix rootfs-propagation

Author: liangchenye

completions/bash/oci-runtime-tool

@@ -130,11 +130,9 @@ __oci-runtime-tool_complete_compliance_level() {
 __oci-runtime-tool_complete_propagations() {
 	COMPREPLY=( $( compgen -W "
 		private
-		rprivate
-		rshared
-		rslave
 		shared
 		slave
+		unbindable
 	" -- "$cur" ) )
 }
 

generate/generate.go

@@ -722,13 +722,11 @@ func (g *Generator) SetLinuxRootPropagation(rp string) error {
 	switch rp {
 	case "":
 	case "private":
-	case "rprivate":
 	case "slave":
-	case "rslave":
 	case "shared":
-	case "rshared":
+	case "unbindable":
 	default:
-		return fmt.Errorf("rootfs-propagation must be empty or one of private|rprivate|slave|rslave|shared|rshared")
+		return fmt.Errorf("rootfs-propagation must be empty or one of private|slave|shared|unbindable")
 	}
 	g.initSpecLinux()
 	g.spec.Linux.RootfsPropagation = rp