Skip to content

run_qemu.sh: pass --debug to mkosi #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marc-hb merged 3 commits into from
Nov 10, 2025
Merged

run_qemu.sh: pass --debug to mkosi #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
195cb12
run_qemu.sh: pass --debug to mkosi
marc-hb Nov 10, 2025
402808f
.github: add --debug in the first, mkosi step too
marc-hb Nov 10, 2025
6f71e8a
run_qemu.sh: turn off set -x logs while polling every 5s
marc-hb Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
PATH=/usr/lib/ccache:"$PATH" \
distro=${{ matrix.cfg.img_distro }} rev=${{ matrix.cfg.img_rel }} \
ndctl='${{ github.workspace }}'/ndctl \
../run_qemu/run_qemu.sh ${{ matrix.run_opts }} --no-kvm --timeout=20
../run_qemu/run_qemu.sh ${{ matrix.run_opts }} --no-kvm --timeout=20 --debug

- name: upload test logs
if: ${{ !cancelled() }}
Expand Down
17 changes: 11 additions & 6 deletions run_qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,10 +1443,14 @@ make_rootfs()
setup_autorun "mkosi.extra"

if [[ $_arg_debug == "on" ]]; then
# In case of yet another mkosi incompatibility or other issue,
# enable this line. WARNING: --debug options have "stability" issues
# too! Check the man page of your specific mkosi version
: # mkosi_opts+=('--debug-workspace' '--debug-shell' '--debug')
if test "$mkosi_ver" -lt 15; then
mkosi_opts+=('--debug=run')
else # See mkosi v15 commit a13e4b0e7056cc
mkosi_opts+=('--debug')
fi
# Newer options check the man page of your specific mkosi
# version, find links a the bottom of run_qemu/README.md
# mkosi_opts+=('--debug-workspace' '--debug-shell')
fi

mkosi_opts+=("build")
Expand Down Expand Up @@ -1996,14 +2000,15 @@ start_qemu()
else
printf "guest will be terminated after %d minute(s)\n" "$_arg_timeout"
"${qcmd[@]}" & sleep 5
timeout_sec="$(((_arg_timeout * 60) - 5))"
( timeout_sec="$(((_arg_timeout * 60) - 5))"
while ((timeout_sec > 0)); do
if ! guest_alive; then
break
fi
sleep 5
timeout_sec="$((timeout_sec - 5))"
done
set +x
done )
kill_guest
fi
popd > /dev/null || exit 1
Expand Down