Merge pull request #163 from laijs/RootfsPropagation

Deduplicate the field of RootfsPropagation
opencontainers · Sep 9, 2015 · fd0ff56 · fd0ff56
2 parents 931c6a9 + 339e038
commit fd0ff56
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/config-linux.md b/config-linux.md
@@ -16,16 +16,6 @@ Valid values are the string after `CAP_` for capabilities defined in [the man pa
     ]
 ```
 
-## Rootfs Mount Propagation
-
-rootfsPropagation sets the rootfs's mount propagation.
-Its value is either slave, private, or shared.
-[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
-
-```json
-    "rootfsPropagation": "slave",
-```
-
 ## User namespace mappings
 
 ```json

diff --git a/config_linux.go b/config_linux.go
@@ -13,8 +13,6 @@ type LinuxSpec struct {
 type Linux struct {
 	// Capabilities are linux capabilities that are kept for the container.
 	Capabilities []string `json:"capabilities"`
-	// RootfsPropagation is the rootfs mount propagation mode for the container.
-	RootfsPropagation string `json:"rootfsPropagation"`
 }
 
 // User specifies linux specific user and group information for the container's

diff --git a/runtime-config-linux.md b/runtime-config-linux.md
@@ -194,3 +194,13 @@ The actions and operators are strings that match the definitions in seccomp.h fr
        ]
    }
 ```
+
+## Rootfs Mount Propagation
+
+rootfsPropagation sets the rootfs's mount propagation.
+Its value is either slave, private, or shared.
+[The kernel doc](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt) has more information about mount propagation.
+
+```json
+    "rootfsPropagation": "slave",
+```