From 5d352f6a8754e8d1f2758669336280e5bae47968 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 27 Apr 2022 00:52:49 +0200
Subject: [PATCH] cmd/dockerd: remove config_common_unix.go

This file was originally part of the work to support Solaris, and
there's nothing "not common unix" anymmore, so merging the files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 cmd/dockerd/config_common_unix.go | 43 -------------------------------
 cmd/dockerd/config_unix.go        | 33 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 43 deletions(-)
 delete mode 100644 cmd/dockerd/config_common_unix.go

diff --git a/cmd/dockerd/config_common_unix.go b/cmd/dockerd/config_common_unix.go
deleted file mode 100644
index ab64539fe3..0000000000
--- a/cmd/dockerd/config_common_unix.go
+++ /dev/null
@@ -1,43 +0,0 @@
-//go:build linux || freebsd
-// +build linux freebsd
-
-package main
-
-import (
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/homedir"
-)
-
-func getDefaultPidFile() (string, error) {
-	if !honorXDG {
-		return "/var/run/docker.pid", nil
-	}
-	runtimeDir, err := homedir.GetRuntimeDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(runtimeDir, "docker.pid"), nil
-}
-
-func getDefaultDataRoot() (string, error) {
-	if !honorXDG {
-		return "/var/lib/docker", nil
-	}
-	dataHome, err := homedir.GetDataHome()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(dataHome, "docker"), nil
-}
-
-func getDefaultExecRoot() (string, error) {
-	if !honorXDG {
-		return "/var/run/docker", nil
-	}
-	runtimeDir, err := homedir.GetRuntimeDir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(runtimeDir, "docker"), nil
-}
diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go
index 6e6aa81bed..51a27eb326 100644
--- a/cmd/dockerd/config_unix.go
+++ b/cmd/dockerd/config_unix.go
@@ -97,3 +97,36 @@ func configureCertsDir() {
 		}
 	}
 }
+
+func getDefaultPidFile() (string, error) {
+	if !honorXDG {
+		return "/var/run/docker.pid", nil
+	}
+	runtimeDir, err := homedir.GetRuntimeDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(runtimeDir, "docker.pid"), nil
+}
+
+func getDefaultDataRoot() (string, error) {
+	if !honorXDG {
+		return "/var/lib/docker", nil
+	}
+	dataHome, err := homedir.GetDataHome()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(dataHome, "docker"), nil
+}
+
+func getDefaultExecRoot() (string, error) {
+	if !honorXDG {
+		return "/var/run/docker", nil
+	}
+	runtimeDir, err := homedir.GetRuntimeDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(runtimeDir, "docker"), nil
+}