pkg/config: override DefaultInitPath for FreeBSD

FreeBSD packages typically install files under /usr/local on FreeBSD. Signed-off-by: Doug Rabson <[email protected]>
containers · Jun 12, 2023 · d6abc58 · d6abc58
1 parent 9635bc0
commit d6abc58
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -511,12 +511,12 @@ image_copy_tmp_dir="storage"`
 
 		It("Test Capabilities call", func() {
 			// Given
-			// When
-			config, err := NewConfig("")
-			// Then
 			if runtime.GOOS != "linux" {
 				Skip(fmt.Sprintf("capabilities not supported on %s", runtime.GOOS))
 			}
+			// When
+			config, err := NewConfig("")
+			// Then
 			gomega.Expect(err).To(gomega.BeNil())
 			var addcaps, dropcaps []string
 			caps, err := config.Capabilities("0", addcaps, dropcaps)

diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -32,8 +32,6 @@ const (
 )
 
 var (
-	// DefaultInitPath is the default path to the container-init binary.
-	DefaultInitPath = "/usr/libexec/podman/catatonit"
 	// DefaultInfraImage is the default image to run as infrastructure containers in pods.
 	DefaultInfraImage = ""
 	// DefaultRootlessSHMLockPath is the default path for rootless SHM locks.

diff --git a/pkg/config/default_common.go b/pkg/config/default_common.go
@@ -0,0 +1,7 @@
+//go:build !freebsd
+// +build !freebsd
+
+package config
+
+// DefaultInitPath is the default path to the container-init binary.
+var DefaultInitPath = "/usr/libexec/podman/catatonit"
diff --git a/pkg/config/default_freebsd.go b/pkg/config/default_freebsd.go
@@ -1,5 +1,8 @@
 package config
 
+// DefaultInitPath is the default path to the container-init binary.
+var DefaultInitPath = "/usr/local/libexec/podman/catatonit"
+
 func getDefaultCgroupsMode() string {
 	return "enabled"
 }