Skip to content

Commit 195cb12

Browse files
committed
run_qemu.sh: pass --debug to mkosi
Add v14/v15 test to adjust option based on the mkosi version. No need to change the run_qemu.sh source code anymore. Passing --debug by default is especially useful because hides the sandbox unless --debug is uses, see systemd/mkosi#3992 Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 1d52540 commit 195cb12

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

run_qemu.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,10 +1443,14 @@ make_rootfs()
14431443
setup_autorun "mkosi.extra"
14441444

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

14521456
mkosi_opts+=("build")

0 commit comments

Comments
 (0)