particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manifest: use new ostree mount in fstab stage for commit deployment

Browse source 
Use the new stage mount instead of the old stage-specific options.
This commit is contained in:
Achilleas Koutsou 2022-08-23 19:12:01 +02:00 • committed by Tom Gundersen
parent 1de55c73e6
commit fbe8c1cb39
7 changed files with 81 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/manifest/commit_deployment.go
View file

@ -152,13 +152,9 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
))
fstabOptions := osbuild.NewFSTabStageOptions(p.PartitionTable)
fstabOptions.OSTree = &osbuild.OSTreeFstab{
Deployment: osbuild.OSTreeDeployment{
OSName: p.osName,
Ref: p.osTreeRef,
},
}
pipeline.AddStage(osbuild.NewFSTabStage(fstabOptions))
fstabStage := osbuild.NewFSTabStage(fstabOptions)
fstabStage.MountOSTree(p.osName, p.osTreeRef, 0)
pipeline.AddStage(fstabStage)
if p.Keyboard != "" {
options := &osbuild.KeymapStageOptions{

19
test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
View file

@ -1888,14 +1888,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",

19
test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
View file

@ -1912,14 +1912,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",

19
test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
View file

@ -2136,14 +2136,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",

19
test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
View file

@ -2160,14 +2160,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",

19
test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
View file

@ -2144,14 +2144,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",

19
test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
View file

@ -2168,14 +2168,21 @@
"options": "umask=0077,shortname=winnt",
"passno": 2
}
],
"ostree": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot"
]
},
"mounts": [
{
"name": "ostree-test/fedora/iot",
"type": "org.osbuild.ostree.deployment",
"options": {
"deployment": {
"osname": "fedora-iot",
"ref": "test/fedora/iot",
"serial": 0
}
}
}
}
]
},
{
"type": "org.osbuild.keymap",