opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-14 03:21:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor containerd/cgroups

Browse Source 
We need to vendor in the latest containerd/cgroups for a fix related to
slice delegation and systemd <= 239. The opencontainer/runtime-spec is
brought along for the ride.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1414
Approved by: mheon
This commit is contained in:
baude
2018-09-05 18:30:30 -05:00
committed by Atomic Bot
parent 2e6243b185
commit bbbbfa582b
32 changed files with 1137 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vendor/github.com/containerd/cgroups/devices.go generated vendored
View File

@ -1,3 +1,19 @@
/*
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 cgroups
import (
@ -42,6 +58,9 @@ func (d *devicesController) Create(path string, resources *specs.LinuxResources)
if device.Allow {
file = allowDeviceFile
}
if device.Type == "" {
device.Type = "a"
}
if err := ioutil.WriteFile(
filepath.Join(d.Path(path), file),
[]byte(deviceString(device)),
@ -58,11 +77,11 @@ func (d *devicesController) Update(path string, resources *specs.LinuxResources)
}
func deviceString(device specs.LinuxDeviceCgroup) string {
return fmt.Sprintf("%c %s:%s %s",
&device.Type,
return fmt.Sprintf("%s %s:%s %s",
device.Type,
deviceNumber(device.Major),
deviceNumber(device.Minor),
&device.Access,
device.Access,
)
}