Skip to content

Commit 776d0b9

Browse files
committed
osbuild: supress disk usage log and add tips
The log disk usage message comming every 10 seconds is quite noisy, hide it by default. We can always uncomment it to investigate. I aslo added a couple of helpful tips in comments given by @dustymabe to work with osbuild.
1 parent bba409a commit 776d0b9

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/cmd-osbuild

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,12 @@ main() {
405405
else
406406
cmd="runvm_with_cache"
407407
fi
408-
$cmd -- /usr/lib/coreos-assembler/runvm-osbuild \
408+
409+
# To get a shell in the osbuild supermin VM uncomment this.
410+
# osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
411+
# See comment about checkpoints in runvm-osbuild
412+
# RUNVM_SHELL=1 \
413+
$cmd -- /usr/lib/coreos-assembler/runvm-osbuild \
409414
--config "${runvm_osbuild_config_json}" \
410415
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \
411416
--outdir "${outdir}" \

src/runvm-osbuild

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,16 @@ set -x; osbuild-mpp \
109109
"${mppyaml}" "${processed_json}"
110110
set +x
111111

112-
log_disk_usage
112+
#log_disk_usage
113113

114114
# Build the image
115115
set -x
116116
# shellcheck disable=SC2068
117+
# To stop osbuild at a given stage to inspect the state of
118+
# things you can add `--break stage_id` to the following.
119+
# eg : `--break org.osbuild.bootc.install-to-filesystem`
120+
# The osbuild environnement is set up under `/run/osbuild`
121+
# Use it in conjuction with `RUNVM_SHELL=1 in `cmd-osbuild`
117122
osbuild \
118123
--out "$outdir" \
119124
--store "$storedir" \

0 commit comments

Comments
 (0)