Skip to content

Commit

Permalink
Merge pull request #19013 from dfr/emulate-linux
Browse files Browse the repository at this point in the history
pkg/specgen: Add support for Linux emulation on FreeBSD
  • Loading branch information
openshift-merge-robot authored Jun 28, 2023
2 parents be49741 + 609c47a commit 9067d5c
Showing 1 changed file with 51 additions and 1 deletion.
52 changes: 51 additions & 1 deletion pkg/specgen/generate/oci_freebsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package generate

import (
"context"
"fmt"
"strings"

"github.com/containers/common/libimage"
Expand All @@ -17,7 +18,11 @@ import (

// SpecGenToOCI returns the base configuration for the container.
func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *libimage.Image, mounts []spec.Mount, pod *libpod.Pod, finalCmd []string, compatibleOptions *libpod.InfraInherit) (*spec.Spec, error) {
g, err := generate.New("freebsd")
if s.ImageOS != "freebsd" && s.ImageOS != "linux" {
return nil, fmt.Errorf("unsupported image OS: %s", s.ImageOS)
}

g, err := generate.New(s.ImageOS)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -49,6 +54,51 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
return nil, err
}

// Linux emulatioon
if s.ImageOS == "linux" {
var mounts []spec.Mount
for _, m := range configSpec.Mounts {
switch m.Destination {
case "/proc":
m.Type = "linprocfs"
m.Options = []string{"nodev"}
mounts = append(mounts, m)
continue
case "/sys":
m.Type = "linsysfs"
m.Options = []string{"nodev"}
mounts = append(mounts, m)
continue
case "/dev", "/dev/pts", "/dev/shm", "/dev/mqueue":
continue
}
}
mounts = append(mounts,
spec.Mount{
Destination: "/dev",
Type: "devfs",
Source: "devfs",
Options: []string{
"ruleset=4",
"rule=path shm unhide mode 1777",
},
},
spec.Mount{
Destination: "/dev/fd",
Type: "fdescfs",
Source: "fdesc",
Options: []string{},
},
spec.Mount{
Destination: "/dev/shm",
Type: "tmpfs",
Source: "shm",
Options: []string{"notmpcopyup"},
},
)
configSpec.Mounts = mounts
}

// BIND MOUNTS
configSpec.Mounts = SupersedeUserMounts(mounts, configSpec.Mounts)
// Process mounts to ensure correct options
Expand Down

0 comments on commit 9067d5c

Please sign in to comment.