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

manifest: add ostree mount to stages in OSTreeDeployment

Browse source 
Stages that modify files in the ostree deployment need the sysroot
bindmount for any changes to take effect.
Adding the mount to the keymap and locale stages since they need to
modify files in /etc.
This commit is contained in:
Achilleas Koutsou 2022-08-23 18:19:55 +02:00 • committed by Tom Gundersen
parent 0750049739
commit 0386d68db4
7 changed files with 170 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1897,13 +1897,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",

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

@ -1921,13 +1921,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",

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

@ -2145,13 +2145,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",

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

@ -2169,13 +2169,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",

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

@ -2153,13 +2153,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",

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

@ -2177,13 +2177,39 @@
"type": "org.osbuild.keymap",
"options": {
"keymap": "us"
}
},
"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.locale",
"options": {
"language": "C.UTF-8"
}
},
"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.grub2",