fixups

Author: jbtrystram

src/cmd-osbuild

@@ -397,6 +397,9 @@ main() {
     fi
 
     outdir=$(mktemp -p "${tmp_builddir}" -d)
+    # To get a shell in the osbuild supervin VM uncomment this.
+    # osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
+    # RUNVM_SHELL=1 \
     runvm_with_cache -- /usr/lib/coreos-assembler/runvm-osbuild                                         \
                 --config "${runvm_osbuild_config_json}"                                                 \
                 --mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \

src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

@@ -274,11 +274,13 @@ pipelines:
                 name: coreos.ociarchive
         options:
           kernel-args:
-            - rw
             - '$ignition_firstboot'
             - mpp-format-string: '{extra_kargs}'
           target-imgref:
             mpp-format-string: '{container_imgref}'
+          stateroot: fedora-coreos
+          boot-mount-spec: ""
+          root-mount-spec: ""
         devices:
           disk:
             type: org.osbuild.loopback

src/runvm-osbuild

@@ -114,11 +114,16 @@ set -x; osbuild-mpp                                       \
     "${mppyaml}" "${processed_json}"
 set +x
 
-log_disk_usage
+#log_disk_usage
 
 # Build the image
 set -x
 # shellcheck disable=SC2068
+# To stop osbuild at a given stage to inspect the state of
+# things you can add `--break stage_id` to the following.
+# eg : `--break org.osbuild.bootc.install-to-filesystem`
+# The osbuild environnement is set up under `/run/osbuild`
+# Use it in conjuction with `RUNVM_SHELL=1 in `cmd-osbuild`
 osbuild \
     --out "$outdir"              \
     --store "$storedir"          \