osbuild: add support for resolv-conf stage

This commit is contained in:
Jozef Mikovic 2021-03-22 11:32:21 +01:00 committed by Tom Gundersen
parent 3e566398ec
commit 295bc09592
3 changed files with 37 additions and 0 deletions

View file

@ -283,6 +283,8 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
p.AddStage(osbuild.NewRPMStage(t.rpmStageOptions(*t.arch, repos, packageSpecs)))
p.AddStage(osbuild.NewFixBLSStage())
p.AddStage(osbuild.NewResolvConfStage(t.resolvConfOptions()))
if pt != nil {
p.AddStage(osbuild.NewFSTabStage(pt.FSTabStageOptions()))
}
@ -460,6 +462,10 @@ func (t *imageType) userStageOptions(users []blueprint.UserCustomization) (*osbu
return &options, nil
}
func (t *imageType) resolvConfOptions() *osbuild.ResolvConfStageOptions {
return &osbuild.ResolvConfStageOptions{}
}
func (t *imageType) groupStageOptions(groups []blueprint.GroupCustomization) *osbuild.GroupsStageOptions {
options := osbuild.GroupsStageOptions{
Groups: map[string]osbuild.GroupsStageOptionsGroup{},

View file

@ -0,0 +1,15 @@
package osbuild1
type ResolvConfStageOptions struct {
Nameserver []string `json:"nameserver,omitempty"`
Search []string `json:"search,omitempty"`
}
func (ResolvConfStageOptions) isStageOptions() {}
func NewResolvConfStage(options *ResolvConfStageOptions) *Stage {
return &Stage{
Name: "org.osbuild.resolv-conf",
Options: options,
}
}

View file

@ -0,0 +1,16 @@
package osbuild1
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestNewResolvConfStageStage(t *testing.T) {
expectedStage := &Stage{
Name: "org.osbuild.resolv-conf",
Options: &ResolvConfStageOptions{},
}
actualStage := NewResolvConfStage(&ResolvConfStageOptions{})
assert.Equal(t, expectedStage, actualStage)
}