diff --git a/config-linux.md b/config-linux.md index f7723c74..50811d79 100644 --- a/config-linux.md +++ b/config-linux.md @@ -112,7 +112,7 @@ The runtime may supply them however it likes (with [mknod][mknod.2], by bind mou The following parameters can be specified: -* **`type`** *(char, required)* - type of device: `c`, `b`, `u` or `p`. +* **`type`** *(string, required)* - type of device: `c`, `b`, `u` or `p`. More info in [mknod(1)][mknod.1]. * **`path`** *(string, required)* - full path to device inside container. * **`major, minor`** *(int64, required unless **`type`** is `p`)* - [major, minor numbers][devices] for the device. @@ -130,7 +130,7 @@ The following parameters can be specified: "type": "c", "major": 10, "minor": 229, - "fileMode": 0666, + "fileMode": 438, "uid": 0, "gid": 0 }, @@ -139,7 +139,7 @@ The following parameters can be specified: "type": "b", "major": 8, "minor": 0, - "fileMode": 0660, + "fileMode": 432, "uid": 0, "gid": 0 } @@ -194,7 +194,7 @@ The runtime MUST apply entries in the listed order. The following parameters can be specified: * **`allow`** *(boolean, required)* - whether the entry is allowed or denied. -* **`type`** *(char, optional)* - type of device: `a` (all), `c` (char), or `b` (block). +* **`type`** *(string, optional)* - type of device: `a` (all), `c` (char), or `b` (block). `null` or unset values mean "all", mapping to `a`. * **`major, minor`** *(int64, optional)* - [major, minor numbers][devices] for the device. `null` or unset values mean "all", mapping to [`*` in the filesystem API][cgroup-v1-devices]. diff --git a/config_linux.go b/config_linux.go index 72027112..6b064ca9 100644 --- a/config_linux.go +++ b/config_linux.go @@ -238,7 +238,7 @@ type Device struct { // Path to the device. Path string `json:"path"` // Device type, block, char, etc. - Type rune `json:"type"` + Type string `json:"type"` // Major is the device's major number. Major int64 `json:"major"` // Minor is the device's minor number. @@ -256,7 +256,7 @@ type DeviceCgroup struct { // Allow or deny Allow bool `json:"allow"` // Device type, block, char, etc. - Type *rune `json:"type,omitempty"` + Type *string `json:"type,omitempty"` // Major is the device's major number. Major *int64 `json:"major,omitempty"` // Minor is the device's minor number.