diff --git a/container/docker/factory.go b/container/docker/factory.go index 8144e261..2f3b4977 100644 --- a/container/docker/factory.go +++ b/container/docker/factory.go @@ -22,6 +22,7 @@ import ( "strconv" "strings" + "github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups/systemd" "github.com/fsouza/go-dockerclient" "github.com/golang/glog" @@ -42,8 +43,10 @@ var useSystemd bool func init() { useSystemd = systemd.UseSystemd() - if useSystemd { - glog.Infof("System is using systemd") + if !useSystemd { + // Second attempt at checking for systemd, check for a "name=systemd" cgroup. + _, err := cgroups.FindCgroupMountpoint("name=systemd") + useSystemd = (err == nil) } } @@ -200,6 +203,10 @@ func Register(factory info.MachineInfoFactory) error { } } + if useSystemd { + glog.Infof("System is using systemd") + } + glog.Infof("Registering Docker factory") f := &dockerFactory{ machineInfoFactory: factory,