image: add users and groups to edge/iot raw images

This commit is contained in:
Achilleas Koutsou 2022-09-05 23:15:50 +02:00 committed by Tom Gundersen
parent 5bc66f0665
commit 6cd3a34099
5 changed files with 51 additions and 11 deletions

View file

@ -10,6 +10,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/platform"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/runner"
"github.com/osbuild/osbuild-composer/internal/users"
"github.com/osbuild/osbuild-composer/internal/workload"
)
@ -20,6 +21,9 @@ type OSTreeRawImage struct {
Workload workload.Workload
PartitionTable *disk.PartitionTable
Users []users.User
Groups []users.Group
OSTreeURL string
OSTreeRef string
OSTreeCommit string
@ -53,6 +57,8 @@ func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
osPipeline.KernelOptionsAppend = img.KernelOptionsAppend
osPipeline.Keyboard = img.Keyboard
osPipeline.Locale = img.Locale
osPipeline.Users = img.Users
osPipeline.Groups = img.Groups
imagePipeline := manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline)