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

test/data: move ostree repo to the iso root

Browse source 
Instead of having the OSTree repo in the anaconda root squashfs,
put the it to the root of the iso. This has several advantages:
first and foremost, we don't have to make a huge squahfs file-
system. We don't have to compress the repo. Additionally, the
repo is now easily accessible by mounting the iso.
This commit is contained in:
Christian Kellner 2021-07-14 18:36:14 +00:00 • committed by Tom Gundersen
parent a19e261dbe
commit e8bf211e0c
2 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

48
test/data/manifests/fedora-ostree-bootiso.json
View file

@ -1657,29 +1657,6 @@
]
}
},
{
"type": "org.osbuild.ostree.init",
"options": {
"path": "/ostree/repo"
}
},
{
"type": "org.osbuild.ostree.pull",
"options": {
"repo": "/ostree/repo"
},
"inputs": {
"commits": {
"type": "org.osbuild.ostree",
"origin": "org.osbuild.pipeline",
"references": {
"name:ostree-commit": {
"ref": "fedora/x86_64/osbuild"
}
}
}
}
},
{
"type": "org.osbuild.locale",
"options": {
@ -1727,13 +1704,36 @@
"name": "bootiso-tree",
"build": "name:build",
"stages": [
{
"type": "org.osbuild.ostree.init",
"options": {
"path": "/ostree"
}
},
{
"type": "org.osbuild.ostree.pull",
"options": {
"repo": "/ostree"
},
"inputs": {
"commits": {
"type": "org.osbuild.ostree",
"origin": "org.osbuild.pipeline",
"references": {
"name:ostree-commit": {
"ref": "fedora/x86_64/osbuild"
}
}
}
}
},
{
"type": "org.osbuild.kickstart",
"options": {
"path": "install.ks",
"ostree": {
"osname": "fedora",
"url": "file:///ostree/repo",
"url": "file:///run/install/repo/ostree",
"ref": "fedora/x86_64/osbuild",
"gpg": false
},

52
test/data/manifests/fedora-ostree-bootiso.mpp.json
View file

@ -426,31 +426,6 @@
]
}
},
{
"type": "org.osbuild.ostree.init",
"options": {
"path": "/ostree/repo"
}
},
{
"type": "org.osbuild.ostree.pull",
"options": {
"repo": "/ostree/repo"
},
"inputs": {
"commits": {
"type": "org.osbuild.ostree",
"origin": "org.osbuild.pipeline",
"references": {
"name:ostree-commit": {
"ref": {
"mpp-format-string": "{ref}"
}
}
}
}
}
},
{
"type": "org.osbuild.locale",
"options": {
@ -500,13 +475,38 @@
"name": "bootiso-tree",
"build": "name:build",
"stages": [
{
"type": "org.osbuild.ostree.init",
"options": {
"path": "/ostree"
}
},
{
"type": "org.osbuild.ostree.pull",
"options": {
"repo": "/ostree"
},
"inputs": {
"commits": {
"type": "org.osbuild.ostree",
"origin": "org.osbuild.pipeline",
"references": {
"name:ostree-commit": {
"ref": {
"mpp-format-string": "{ref}"
}
}
}
}
}
},
{
"type": "org.osbuild.kickstart",
"options": {
"path": "install.ks",
"ostree": {
"osname": "fedora",
"url": "file:///ostree/repo",
"url": "file:///run/install/repo/ostree",
"ref": {
"mpp-format-string": "{ref}"
},