Add support for OpenBSD in addition to FreeBSD

I am looking at using these modules in containerd, so that we can reduce the effort of maintaining "mountinfo" implementations. The containerd variant of this module currently supports OpenBSD in addition to FreeBSD. This patch bring in changes similar to the ones made in containerd in: containerd/containerd@0828b7a Signed-off-by: Sebastiaan van Stijn <[email protected]>
moby · Sep 22, 2020 · 91a75ff · 91a75ff
1 parent bbb236c
commit 91a75ff
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/mount/flags_freebsd.go → mount/flags_bsd.go b/mount/flags_freebsd.go → mount/flags_bsd.go
@@ -1,4 +1,4 @@
-// +build freebsd,cgo
+// +build freebsd,cgo openbsd,cgo
 
 package mount
 

diff --git a/mount/flags_unsupported.go b/mount/flags_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!freebsd freebsd,!cgo
+// +build !linux,!freebsd,!openbsd freebsd,!cgo openbsd,!cgo
 
 package mount
 

diff --git a/mount/mounter_freebsd.go → mount/mounter_bsd.go b/mount/mounter_freebsd.go → mount/mounter_bsd.go
@@ -1,3 +1,5 @@
+// +build freebsd openbsd
+
 package mount
 
 /*

diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!freebsd freebsd,!cgo
+// +build !linux,!freebsd,!openbsd freebsd,!cgo openbsd,!cgo
 
 package mount
 

diff --git a/mountinfo/doc.go b/mountinfo/doc.go
@@ -1,5 +1,5 @@
 // Package mountinfo provides a set of functions to retrieve information about OS mounts.
-// Currently it supports Linux. For historical reasons, there is also some support for FreeBSD,
+// Currently it supports Linux. For historical reasons, there is also some support for FreeBSD and OpenBSD,
 // and a shallow implementation for Windows, but in general this is Linux-only package, so
 // the rest of the document only applies to Linux, unless explicitly specified otherwise.
 //

diff --git a/mountinfo/mounted_unix.go b/mountinfo/mounted_unix.go
@@ -1,4 +1,4 @@
-// +build linux freebsd,cgo
+// +build linux freebsd,cgo openbsd,cgo
 
 package mountinfo
 

diff --git a/mountinfo/mountinfo_freebsd.go → mountinfo/mountinfo_bsd.go b/mountinfo/mountinfo_freebsd.go → mountinfo/mountinfo_bsd.go
@@ -1,3 +1,5 @@
+// +build freebsd openbsd
+
 package mountinfo
 
 /*
@@ -54,7 +56,7 @@ func parseMountTable(filter FilterFunc) ([]*Info, error) {
 
 func mounted(path string) (bool, error) {
 	// Fast path: compare st.st_dev fields.
-	// This should always work for FreeBSD.
+	// This should always work for FreeBSD and OpenBSD.
 	mounted, err := mountedByStat(path)
 	if err == nil {
 		return mounted, nil

diff --git a/mountinfo/mountinfo_unsupported.go b/mountinfo/mountinfo_unsupported.go
@@ -1,4 +1,4 @@
-// +build !windows,!linux,!freebsd freebsd,!cgo
+// +build !windows,!linux,!freebsd,!openbsd freebsd,!cgo openbsd,!cgo
 
 package mountinfo