Change default image volume mode to "nullfs" on FreeBSD

This fixes a regression in containers/podman#19241 which quite reasonably assumed that the default image volume mode from pkg/config was correct. Signed-off-by: Doug Rabson <[email protected]>
dfr · Jul 17, 2023 · 35b7931 · 35b7931
1 parent 307a9d0
commit 35b7931
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -51,7 +51,7 @@ const (
 	BoltDBStateStore RuntimeStateStore = iota
 )
 
-var validImageVolumeModes = []string{"bind", "tmpfs", "ignore"}
+var validImageVolumeModes = []string{_typeBind, "tmpfs", "ignore"}
 
 // ProxyEnv is a list of Proxy Environment variables
 var ProxyEnv = []string{

diff --git a/pkg/config/config_darwin.go b/pkg/config/config_darwin.go
@@ -14,6 +14,9 @@ const (
 	// DefaultSignaturePolicyPath is the default value for the
 	// policy.json file.
 	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
+
+	// Mount type for mounting host dir
+	_typeBind = "bind"
 )
 
 // podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.

diff --git a/pkg/config/config_freebsd.go b/pkg/config/config_freebsd.go
@@ -14,6 +14,9 @@ const (
 	// DefaultSignaturePolicyPath is the default value for the
 	// policy.json file.
 	DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
+
+	// Mount type for mounting host dir
+	_typeBind = "nullfs"
 )
 
 // podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations.

diff --git a/pkg/config/config_linux.go b/pkg/config/config_linux.go
@@ -17,6 +17,9 @@ const (
 	// DefaultSignaturePolicyPath is the default value for the
 	// policy.json file.
 	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
+
+	// Mount type for mounting host dir
+	_typeBind = "bind"
 )
 
 func selinuxEnabled() bool {

diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go
@@ -12,6 +12,9 @@ const (
 	// DefaultSignaturePolicyPath is the default value for the
 	// policy.json file.
 	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
+
+	// Mount type for mounting host dir
+	_typeBind = "bind"
 )
 
 // podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations.

diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -28,7 +28,7 @@ const (
 	_defaultTransport = "docker://"
 
 	// _defaultImageVolumeMode is a mode to handle built-in image volumes.
-	_defaultImageVolumeMode = "bind"
+	_defaultImageVolumeMode = _typeBind
 )
 
 var (