 94c68aa001
			
		
	
	94c68aa001
	
	
	
		
			
			This function was added in ae22854e2b, but never
returned an error, and the error-return was not handled on the callsite. This
patch removes the unused error return, and moves it to a file related to mounts,
which allowed for some of the stubs to be removed and shared between non-FreeBSD
platforms.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
		
	
		
			
				
	
	
		
			74 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| //go:build !freebsd
 | |
| 
 | |
| /*
 | |
|    Copyright The containerd Authors.
 | |
| 
 | |
|    Licensed under the Apache License, Version 2.0 (the "License");
 | |
|    you may not use this file except in compliance with the License.
 | |
|    You may obtain a copy of the License at
 | |
| 
 | |
|        http://www.apache.org/licenses/LICENSE-2.0
 | |
| 
 | |
|    Unless required by applicable law or agreed to in writing, software
 | |
|    distributed under the License is distributed on an "AS IS" BASIS,
 | |
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | |
|    See the License for the specific language governing permissions and
 | |
|    limitations under the License.
 | |
| */
 | |
| 
 | |
| package oci
 | |
| 
 | |
| import (
 | |
| 	specs "github.com/opencontainers/runtime-spec/specs-go"
 | |
| )
 | |
| 
 | |
| func defaultMounts() []specs.Mount {
 | |
| 	return []specs.Mount{
 | |
| 		{
 | |
| 			Destination: "/proc",
 | |
| 			Type:        "proc",
 | |
| 			Source:      "proc",
 | |
| 			Options:     []string{"nosuid", "noexec", "nodev"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/dev",
 | |
| 			Type:        "tmpfs",
 | |
| 			Source:      "tmpfs",
 | |
| 			Options:     []string{"nosuid", "strictatime", "mode=755", "size=65536k"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/dev/pts",
 | |
| 			Type:        "devpts",
 | |
| 			Source:      "devpts",
 | |
| 			Options:     []string{"nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620", "gid=5"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/dev/shm",
 | |
| 			Type:        "tmpfs",
 | |
| 			Source:      "shm",
 | |
| 			Options:     []string{"nosuid", "noexec", "nodev", "mode=1777", "size=65536k"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/dev/mqueue",
 | |
| 			Type:        "mqueue",
 | |
| 			Source:      "mqueue",
 | |
| 			Options:     []string{"nosuid", "noexec", "nodev"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/sys",
 | |
| 			Type:        "sysfs",
 | |
| 			Source:      "sysfs",
 | |
| 			Options:     []string{"nosuid", "noexec", "nodev", "ro"},
 | |
| 		},
 | |
| 		{
 | |
| 			Destination: "/run",
 | |
| 			Type:        "tmpfs",
 | |
| 			Source:      "tmpfs",
 | |
| 			Options:     []string{"nosuid", "strictatime", "mode=755", "size=65536k"},
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // appendOSMounts is only used on FreeBSD, and a no-op on other platforms.
 | |
| func appendOSMounts(_ *Spec, _ string) {}
 |