Skip to content

Commit 05c3827

Browse files
committed
generate: Drop /dev/mqueue
Linux runtimes are not required to supply this [1,2]. We could supply it via ocitool, but I don't think its wise to try and define two standards (one in opencontainers/specs for what a runtime must supply, and another here with additional stuff), because I don't see a clear definition of something generally useful enough to go here but not in the spec. For example, hosts without CONFIG_POSIX_MQUEUE could be spec-compliant but unable to perform the mqueue mount I'm removing here. [1]: https://github.com/opencontainers/specs/blob/v0.1.1/config-linux.md#default-devices-and-file-systems [2]: opencontainers/runtime-spec#164 Signed-off-by: W. Trevor King <wking@tremily.us>
1 parent 6d8fd60 commit 05c3827

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

generate.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,7 @@ func getDefaultTemplate() (specs.LinuxSpec, specs.LinuxRuntimeSpec) {
528528
},
529529
},
530530
Hostname: "shell",
531-
Mounts: []specs.MountPoint{
532-
{
533-
Name: "mqueue",
534-
Path: "/dev/mqueue",
535-
},
536-
},
531+
Mounts: []specs.MountPoint{},
537532
},
538533
Linux: specs.Linux{
539534
Capabilities: []string{
@@ -556,13 +551,7 @@ func getDefaultTemplate() (specs.LinuxSpec, specs.LinuxRuntimeSpec) {
556551
}
557552
rspec := specs.LinuxRuntimeSpec{
558553
RuntimeSpec: specs.RuntimeSpec{
559-
Mounts: map[string]specs.Mount{
560-
"mqueue": {
561-
Type: "mqueue",
562-
Source: "mqueue",
563-
Options: []string{"nosuid", "noexec", "nodev"},
564-
},
565-
},
554+
Mounts: map[string]specs.Mount{},
566555
},
567556
Linux: specs.LinuxRuntime{
568557
Namespaces: []specs.Namespace{

0 commit comments

Comments
 (0)