Add generator support for FreeBSD

dfr · dfr · commit 91a7b1d64479 · 2022-07-14T15:37:08.000+01:00
Signed-off-by: Doug Rabson &lt;dfr@rabson.org&gt;
diff --git a/generate/generate.go b/generate/generate.go
@@ -42,7 +42,7 @@ type ExportOptions struct {
 // New creates a configuration Generator with the default
 // configuration for the target operating system.
 func New(os string) (generator Generator, err error) {
-	if os != "linux" && os != "solaris" && os != "windows" {
+	if os != "linux" && os != "solaris" && os != "windows" && os != "freebsd" {
 		return generator, fmt.Errorf("no defaults configured for %s", os)
 	}
 
@@ -72,7 +72,7 @@ func New(os string) (generator Generator, err error) {
 		}
 	}
 
-	if os == "linux" || os == "solaris" {
+	if os == "linux" || os == "solaris" || os == "freebsd" {
 		config.Process.User = rspec.User{}
 		config.Process.Env = []string{
 			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type ExportOptions struct {`
`42`	`42`	`// New creates a configuration Generator with the default`
`43`	`43`	`// configuration for the target operating system.`
`44`	`44`	`func New(os string) (generator Generator, err error) {`
`45`		`- if os != "linux" && os != "solaris" && os != "windows" {`
	`45`	`+ if os != "linux" && os != "solaris" && os != "windows" && os != "freebsd" {`
`46`	`46`	`return generator, fmt.Errorf("no defaults configured for %s", os)`
`47`	`47`	`}`
`48`	`48`
`@@ -72,7 +72,7 @@ func New(os string) (generator Generator, err error) {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- if os == "linux" \|\| os == "solaris" {`
	`75`	`+ if os == "linux" \|\| os == "solaris" \|\| os == "freebsd" {`
`76`	`76`	`config.Process.User = rspec.User{}`
`77`	`77`	`config.Process.Env = []string{`
`78`	`78`	`"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",`