From 9f1976ef3e4866fa52577c52f500d5a57b216e54 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Fri, 15 Apr 2016 14:55:30 -0700 Subject: [PATCH] remove systemd cgroup manager --- client/driver/executor/executor_linux.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/client/driver/executor/executor_linux.go b/client/driver/executor/executor_linux.go index 68fb3891d..16f3cd40b 100644 --- a/client/driver/executor/executor_linux.go +++ b/client/driver/executor/executor_linux.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/go-multierror" "github.com/opencontainers/runc/libcontainer/cgroups" cgroupFs "github.com/opencontainers/runc/libcontainer/cgroups/fs" - "github.com/opencontainers/runc/libcontainer/cgroups/systemd" cgroupConfig "github.com/opencontainers/runc/libcontainer/configs" "github.com/hashicorp/nomad/client/allocdir" @@ -219,10 +218,5 @@ func DestroyCgroup(groups *cgroupConfig.Cgroup, cgPaths map[string]string) error // getCgroupManager returns the correct libcontainer cgroup manager. func getCgroupManager(groups *cgroupConfig.Cgroup, paths map[string]string) cgroups.Manager { - var manager cgroups.Manager - manager = &cgroupFs.Manager{Cgroups: groups, Paths: paths} - if systemd.UseSystemd() { - manager = &systemd.Manager{Cgroups: groups, Paths: paths} - } - return manager + return &cgroupFs.Manager{Cgroups: groups, Paths: paths} }