Skip to content

Commit

Permalink
Merge pull request containers#15425 from dfr/freebsd-boltdb
Browse files Browse the repository at this point in the history
libpod: Add definition of containerPlatformState for FreeBSD
  • Loading branch information
openshift-merge-robot authored Aug 23, 2022
2 parents ee2f815 + 8f797ab commit 3bcd804
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 4 deletions.
17 changes: 17 additions & 0 deletions libpod/boltdb_state_freebsd.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//go:build freebsd
// +build freebsd

package libpod

// replaceNetNS handle network namespace transitions after updating a
// container's state.
func replaceNetNS(netNSPath string, ctr *Container, newState *ContainerState) error {
// On FreeBSD, we just record the network jail's name in our state.
newState.NetworkJail = netNSPath
return nil
}

// getNetNSPath retrieves the netns path to be stored in the database
func getNetNSPath(ctr *Container) string {
return ctr.state.NetworkJail
}
4 changes: 2 additions & 2 deletions libpod/boltdb_state_unsupported.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !linux
// +build !linux
//go:build !linux && !freebsd
// +build !linux,!freebsd

package libpod

Expand Down
12 changes: 12 additions & 0 deletions libpod/container_freebsd.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//go:build freebsd
// +build freebsd

package libpod

type containerPlatformState struct {
// NetworkJail is the name of the container's network VNET
// jail. Will only be set if config.CreateNetNS is true, or
// the container was told to join another container's network
// namespace.
NetworkJail string `json:"-"`
}
4 changes: 2 additions & 2 deletions libpod/container_unsupported.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !linux
// +build !linux
//go:build !linux && !freebsd
// +build !linux,!freebsd

package libpod

Expand Down

0 comments on commit 3bcd804

Please sign in to comment.