diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index a16d263ff..66a45c8d2 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -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{}, diff --git a/internal/osbuild1/resolv_conf_stage.go b/internal/osbuild1/resolv_conf_stage.go new file mode 100644 index 000000000..41a4c8591 --- /dev/null +++ b/internal/osbuild1/resolv_conf_stage.go @@ -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, + } +} diff --git a/internal/osbuild1/resolv_conf_stage_test.go b/internal/osbuild1/resolv_conf_stage_test.go new file mode 100644 index 000000000..dc9fd34ab --- /dev/null +++ b/internal/osbuild1/resolv_conf_stage_test.go @@ -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) +}