Merge pull request #19031 from dfr/freebsd-init

pkg/specgen: add support for 'podman run --init' on FreeBSD
containers · Jun 28, 2023 · f0cb8df · f0cb8df
2 parents 455c7c8 + 865d77e
commit f0cb8df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/libpod/define/mount_freebsd.go b/libpod/define/mount_freebsd.go
@@ -6,3 +6,8 @@ const (
 	// TypeBind is the type for mounting host dir
 	TypeBind = "nullfs"
 )
+
+var (
+	// Mount potions for bind
+	BindOptions = []string{}
+)
diff --git a/libpod/define/mount_linux.go b/libpod/define/mount_linux.go
@@ -6,3 +6,8 @@ const (
 	// TypeBind is the type for mounting host dir
 	TypeBind = "bind"
 )
+
+var (
+	// Mount potions for bind
+	BindOptions = []string{"bind"}
+)
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go
@@ -363,7 +363,7 @@ func addContainerInitBinary(s *specgen.SpecGenerator, path string) (spec.Mount,
 		Destination: define.ContainerInitPath,
 		Type:        define.TypeBind,
 		Source:      path,
-		Options:     []string{define.TypeBind, "ro"},
+		Options:     append(define.BindOptions, "ro"),
 	}
 
 	if path == "" {