projects
/
docker.io.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3eea4c7
)
cgroupdriver-cgroupfs
author
Paul Tagliamonte
<paultag@debian.org>
Wed, 4 Nov 2015 08:09:02 +0000
(08:09 +0000)
committer
Tianon Gravi
<tianon@debian.org>
Wed, 4 Nov 2015 08:09:02 +0000
(08:09 +0000)
Gbp-Pq: Name cgroupdriver-cgroupfs.patch
daemon/execdriver/native/driver.go
patch
|
blob
|
history
diff --git
a/daemon/execdriver/native/driver.go
b/daemon/execdriver/native/driver.go
index c5d4d964c3397466db8ac065ae258585279fed6e..6477081ecf9a8bb56f409a40dc462b999107a586 100644
(file)
--- a/
daemon/execdriver/native/driver.go
+++ b/
daemon/execdriver/native/driver.go
@@
-70,9
+70,9
@@
func NewDriver(root, initPath string, options []string) (*driver, error) {
// this makes sure there are no breaking changes to people
// who upgrade from versions without native.cgroupdriver opt
cgm := libcontainer.Cgroupfs
- if systemd.UseSystemd() {
-
cgm = libcontainer.SystemdCgroups
- }
+
//
if systemd.UseSystemd() {
+
//
cgm = libcontainer.SystemdCgroups
+
//
}
// parse the options
for _, option := range options {