0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11290 from LK4D4/fix_lxc_for_new_api

Browse source 
Use CgroupString instead of missing GetCgroupAllowString in lxc_template
This commit is contained in:
Michael Crosby 2015-03-10 10:39:17 -07:00
commit 1835665e94
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/execdriver/lxc/driver.go
View file

@ -420,6 +420,9 @@ func setupUser(userSpec string) error {
if err != nil {
return err
}
if err := syscall.Setgroups(execUser.Sgids); err != nil {
return err
}
if err := system.Setgid(execUser.Gid); err != nil {
return err
}

2
daemon/execdriver/lxc/lxc_template.go
View file

@ -51,7 +51,7 @@ lxc.cgroup.devices.allow = a
lxc.cgroup.devices.deny = a
#Allow the devices passed to us in the AllowedDevices list.
{{range $allowedDevice := .AllowedDevices}}
lxc.cgroup.devices.allow = {{$allowedDevice.GetCgroupAllowString}}
lxc.cgroup.devices.allow = {{$allowedDevice.CgroupString}}
{{end}}
{{end}}