(v2) cmd: dockerd: make systemd specific cgroups tweaks build-time optional

cmd/dockerd/daemon_nosystemd_unix.go

@@ -0,0 +1,15 @@
+//go:build no_systemd
+
+package main
+
+import (
+	"github.com/docker/docker/daemon/config"
+)
+
+func newCgroupParent(config *config.Config) string {
+	if config.CgroupParent == "" {
+		return "docker"
+	} else {
+		return config.CgroupParent
+	}
+}

cmd/dockerd/daemon_systemd_unix.go

@@ -0,0 +1,23 @@
+//go:build linux && !no_systemd
+
+package main
+
+import (
+	"github.com/docker/docker/daemon"
+	"github.com/docker/docker/daemon/config"
+)
+
+func newCgroupParent(config *config.Config) string {
+	cgroupParent := "docker"
+	useSystemd := daemon.UsingSystemd(config)
+	if useSystemd {
+		cgroupParent = "system.slice"
+	}
+	if config.CgroupParent != "" {
+		cgroupParent = config.CgroupParent
+	}
+	if useSystemd {
+		cgroupParent = cgroupParent + ":" + "docker" + ":"
+	}
+	return cgroupParent
+}

cmd/dockerd/daemon_unix.go

@@ -12,8 +12,6 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/log"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/libcontainerd/supervisor"
 	"github.com/docker/docker/libnetwork/portallocator"
 	"github.com/docker/docker/pkg/homedir"
@@ -101,21 +99,6 @@ func allocateDaemonPort(addr string) error {
 	return nil
 }
 
-func newCgroupParent(config *config.Config) string {
-	cgroupParent := "docker"
-	useSystemd := daemon.UsingSystemd(config)
-	if useSystemd {
-		cgroupParent = "system.slice"
-	}
-	if config.CgroupParent != "" {
-		cgroupParent = config.CgroupParent
-	}
-	if useSystemd {
-		cgroupParent = cgroupParent + ":" + "docker" + ":"
-	}
-	return cgroupParent
-}
-
 func (cli *DaemonCli) initContainerd(ctx context.Context) (func(time.Duration) error, error) {
 	if cli.ContainerdAddr != "" {
 		// use system containerd at the given address.