Explorar o código

Merge pull request #11290 from LK4D4/fix_lxc_for_new_api

Use CgroupString instead of missing GetCgroupAllowString in lxc_template
Michael Crosby %!s(int64=10) %!d(string=hai) anos
pai
achega
1835665e94
Modificáronse 2 ficheiros con 4 adicións e 1 borrados
  1. 3 0
      daemon/execdriver/lxc/driver.go
  2. 1 1
      daemon/execdriver/lxc/lxc_template.go

+ 3 - 0
daemon/execdriver/lxc/driver.go

@@ -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
 	}

+ 1 - 1
daemon/execdriver/lxc/lxc_template.go

@@ -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}}