Merge pull request #854 from jhowardmsft/mount

Mount correction

Author: tianon

config.md

@@ -65,15 +65,10 @@ For all platform-specific configuration values, the scope defined below in the [
     For Linux, the parameters are as documented in [mount(2)][mount.2] system call man page.
     For Solaris, the mount entry corresponds to the 'fs' resource in the [zonecfg(1M)][zonecfg.1m] man page.
 
-
 * **`destination`** (string, REQUIRED) Destination of mount point: path inside container.
     This value MUST be an absolute path.
     * Windows: one mount destination MUST NOT be nested within another mount (e.g., c:\\foo and c:\\foo\\bar).
     * Solaris: corresponds to "dir" of the fs resource in [zonecfg(1M)][zonecfg.1m].
-* **`type`** (string, OPTIONAL) The type of the filesystem to be mounted.
-    * Linux: filesystem types supported by the kernel as listed in */proc/filesystems* (e.g., "minix", "ext2", "ext3", "jfs", "xfs", "reiserfs", "msdos", "proc", "nfs", "iso9660").
-    * Windows: this field MUST NOT be supplied.
-    * Solaris: corresponds to "type" of the fs resource in [zonecfg(1M)][zonecfg.1m].
 * **`source`** (string, OPTIONAL) A device name, but can also be a directory name or a dummy.
     Path values are either absolute or relative to the bundle.
     * Windows: a local directory on the filesystem of the container host. UNC paths and mapped drives are not supported.
@@ -83,6 +78,26 @@ For all platform-specific configuration values, the scope defined below in the [
       Note both [filesystem-independent][mount.8-filesystem-independent] and [filesystem-specific][mount.8-filesystem-specific] options are listed.
     * Solaris: corresponds to "options" of the fs resource in [zonecfg(1M)][zonecfg.1m].
 
+### Example (Windows)
+
+```json
+"mounts": [
+    {
+        "destination": "C:\\folder-inside-container",
+        "source": "C:\\folder-on-host",
+        "options": []
+    }
+]
+```
+
+### <a name="configLinuxAndSolarisMounts" />Linux and Solaris Mounts
+
+For Linux and Solaris based systems the mounts structure has the following fields:
+
+* **`type`** (string, OPTIONAL) The type of the filesystem to be mounted.
+  * Linux: filesystem types supported by the kernel as listed in */proc/filesystems* (e.g., "minix", "ext2", "ext3", "jfs", "xfs", "reiserfs", "msdos", "proc", "nfs", "iso9660").
+  * Solaris: corresponds to "type" of the fs resource in [zonecfg(1M)][zonecfg.1m].
+
 ### Example (Linux)
 
 ```json
@@ -102,18 +117,6 @@ For all platform-specific configuration values, the scope defined below in the [
 ]
 ```
 
-### Example (Windows)
-
-```json
-"mounts": [
-    {
-        "destination": "C:\\folder-inside-container",
-        "source": "C:\\folder-on-host",
-        "options": []
-    }
-]
-```
-
 ### Example (Solaris)
 
 ```json

specs-go/config.go

@@ -112,12 +112,11 @@ type Platform struct {
 
 // Mount specifies a mount for a container.
 type Mount struct {
-	// Destination is the path where the mount will be placed relative to the container's root.  The path and child directories MUST exist, a runtime MUST NOT create directories automatically to a mount point.
+	// Destination is the absolute path where the mount will be placed in the container.
 	Destination string `json:"destination"`
 	// Type specifies the mount kind.
-	Type string `json:"type,omitempty"`
-	// Source specifies the source path of the mount.  In the case of bind mounts on
-	// Linux based systems this would be the file on the host.
+	Type string `json:"type,omitempty" platform:"linux,solaris"`
+	// Source specifies the source path of the mount.
 	Source string `json:"source,omitempty"`
 	// Options are fstab style mount options.
 	Options []string `json:"options,omitempty"`