amend 28ea80f

Author: jbtrystram

src/cmd-osbuild

@@ -416,13 +416,13 @@ main() {
     fi
 
     # To get a shell in the osbuild supermin VM uncomment this.
-    # osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
+    # osbuild can then be started with `bash tmp/build.<artifact>/cmd.sh`
     # See comment about checkpoints in runvm-osbuild
     # RUNVM_SHELL=1 \
-    $cmd -- /usr/lib/coreos-assembler/runvm-osbuild                                         \
-                --config "${runvm_osbuild_config_json}"                                                 \
+    $cmd -- /usr/lib/coreos-assembler/runvm-osbuild                                                                          \
+                --config "${runvm_osbuild_config_json}"                                                                      \
                 --mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}${with_bootc_install}.mpp.yaml" \
-                --outdir "${outdir}"                                                                    \
+                --outdir "${outdir}"                                                                                         \
                 --platforms "$(IFS=,; echo "${platforms[*]}")"
 
     for platform in "${platforms[@]}"; do

src/cmdlib.sh

@@ -765,7 +765,7 @@ rc=0
 if [ -z "${RUNVM_SHELL:-}" ]; then
   (cd ${workdir}; bash ${tmp_builddir}/cmd.sh |& tee /dev/virtio-ports/cosa-cmdout) || rc=\$?
 else
-  (cd ${workdir}; bash)
+  (cd ${workdir}; RUNVM_SHELL=${RUNVM_SHELL} bash)
 fi
 echo \$rc > ${rc_file}
 if [ -n "\${cachedev}" ]; then

src/runvm-osbuild

@@ -109,7 +109,9 @@ set -x; osbuild-mpp                                       \
     "${mppyaml}" "${processed_json}"
 set +x
 
-#log_disk_usage
+if [[ -z "${RUNVM_SHELL:-}" ]]; then
+    log_disk_usage
+fi
 
 # Build the image
 set -x