Skip to content

Commit e4c6845

Browse files
committed
osbuild: use bootc install to deploy the container
Instead of deploying the container to the tree then copy all the contents to the disk image, use bootc to directly manage the installation to the target filesystems. Right now this requires to use the image as the buildroot so this requires python (for osbuild). This is tracked in [1]. [1] bootc-dev/bootc#1410 Requires osbuild/osbuild#2149
1 parent 43b99d5 commit e4c6845

File tree

4 files changed

+62
-291
lines changed

4 files changed

+62
-291
lines changed

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ patch_osbuild() {
182182

183183
## To make it easier to apply patches we'll move around the osbuild
184184
## code on the system first:
185-
rmdir /usr/lib/osbuild/osbuild
186-
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
187-
mkdir /usr/lib/osbuild/tools
188-
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
185+
# mdir /usr/lib/osbuild/osbuild
186+
# mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
187+
# mkdir /usr/lib/osbuild/tools
188+
# mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
189189

190190
## Now all the software is under the /usr/lib/osbuild dir and we can patch
191191
#cat foo.patch | patch -d /usr/lib/osbuild -p1

src/cmd-osbuild

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,10 @@ main() {
397397
fi
398398

399399
outdir=$(mktemp -p "${tmp_builddir}" -d)
400+
# To get a shell in the osbuild supervin VM uncomment this.
401+
# osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
402+
# See comment about checkpoints in runvm-osbuild
403+
# RUNVM_SHELL=1 \
400404
runvm_with_cache -- /usr/lib/coreos-assembler/runvm-osbuild \
401405
--config "${runvm_osbuild_config_json}" \
402406
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \

0 commit comments

Comments
 (0)