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

Merge pull request #555 from avagin/cgroup 

cgroups/systemd: remove useless code
This commit is contained in:
Michael Crosby 2015-04-27 17:44:37 -07:00
parent 984ec36fa1 755bc77482
commit ee61c35f8f
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cgroups/systemd/apply_systemd.go
View File

@ -398,33 +398,7 @@ func joinDevices(c *configs.Cgroup, pid int) error {
}
devices := subsystems["devices"]
if err := devices.Set(path, c); err != nil {
return err
}
if !c.AllowAllDevices {
if err := writeFile(path, "devices.deny", "a"); err != nil {
return err
}
for _, dev := range c.AllowedDevices {
if err := writeFile(path, "devices.allow", dev.CgroupString()); err != nil {
return err
}
}
return nil
}
if err := writeFile(path, "devices.allow", "a"); err != nil {
return err
}
for _, dev := range c.DeniedDevices {
if err := writeFile(path, "devices.deny", dev.CgroupString()); err != nil {
return err
}
}
return nil
return devices.Set(path, c)
}
// Symmetrical public function to update device based cgroups. Also available