Browse code

Merge pull request #17704 from LK4D4/default_cgroupfs

Use fs cgroups by default

Vincent Demeester authored on 2015/11/19 22:01:13
Showing 2 changed files
... ...
@@ -74,9 +74,6 @@ func NewDriver(root, initPath string, options []string) (*Driver, error) {
74 74
 	// this makes sure there are no breaking changes to people
75 75
 	// who upgrade from versions without native.cgroupdriver opt
76 76
 	cgm := libcontainer.Cgroupfs
77
-	if systemd.UseSystemd() {
78
-		cgm = libcontainer.SystemdCgroups
79
-	}
80 77
 
81 78
 	// parse the options
82 79
 	for _, option := range options {
... ...
@@ -446,11 +446,11 @@ single `native.cgroupdriver` option is available.
446 446
 
447 447
 The `native.cgroupdriver` option specifies the management of the container's
448 448
 cgroups. You can specify `cgroupfs` or `systemd`. If you specify `systemd` and
449
-it is not available, the system uses `cgroupfs`. By default, if no option is
450
-specified, the execdriver first tries `systemd` and falls back to `cgroupfs`.
451
-This example sets the execdriver to `cgroupfs`:
449
+it is not available, the system uses `cgroupfs`. If you omit the
450
+`native.cgroupdriver` option,` cgroupfs` is used.
451
+This example sets the `cgroupdriver` to `systemd`:
452 452
 
453
-    $ sudo docker daemon --exec-opt native.cgroupdriver=cgroupfs
453
+    $ sudo docker daemon --exec-opt native.cgroupdriver=systemd
454 454
 
455 455
 Setting this option applies to all containers the daemon launches.
456 456