jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename SystemProperties to Sysctl and make it available in the runc config 

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2015-07-06 19:18:08 -04:00
parent d61480ea3d
commit 8ea6c65d12
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/configs/config.go
View File

@ -135,9 +135,9 @@ type Config struct {
// so that these files prevent any writes. // so that these files prevent any writes.
ReadonlyPaths []string `json:"readonly_paths"` ReadonlyPaths []string `json:"readonly_paths"`
// SystemProperties is a map of properties and their values. It is the equivalent of using // Sysctl is a map of properties and their values. It is the equivalent of using
// sysctl -w my.property.name value in Linux. // sysctl -w my.property.name value in Linux.
SystemProperties map[string]string `json:"system_properties"` Sysctl map[string]string `json:"sysctl"`
// Seccomp allows actions to be taken whenever a syscall is made within the container. // Seccomp allows actions to be taken whenever a syscall is made within the container.
// By default, all syscalls are allowed with actions to allow, trap, kill, or return an errno // By default, all syscalls are allowed with actions to allow, trap, kill, or return an errno

4
libcontainer/integration/exec_test.go
View File

@ -753,7 +753,7 @@ func TestMountCmds(t *testing.T) {
} }
} }
func TestSystemProperties(t *testing.T) { func TestSysctl(t *testing.T) {
if testing.Short() { if testing.Short() {
return return
} }
@ -766,7 +766,7 @@ func TestSystemProperties(t *testing.T) {
defer remove(rootfs) defer remove(rootfs)
config := newTemplateConfig(rootfs) config := newTemplateConfig(rootfs)
config.SystemProperties = map[string]string{ config.Sysctl = map[string]string{
"kernel.shmmni": "8192", "kernel.shmmni": "8192",
} }

2
libcontainer/standard_init_linux.go
View File

@ -65,7 +65,7 @@ func (l *linuxStandardInit) Init() error {
return err return err
} }
for key, value := range l.config.Config.SystemProperties { for key, value := range l.config.Config.Sysctl {
if err := writeSystemProperty(key, value); err != nil { if err := writeSystemProperty(key, value); err != nil {
return err return err
} }

1
spec.go
View File

@ -211,6 +211,7 @@ func createLibcontainerConfig(spec *specs.LinuxSpec) (*configs.Config, error) {
"/proc/sys", "/proc/sysrq-trigger", "/proc/irq", "/proc/bus", "/proc/sys", "/proc/sysrq-trigger", "/proc/irq", "/proc/bus",
} }
} }
config.Sysctl = spec.Linux.Sysctl
return config, nil return config, nil
} }