From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 19 Jan 2025 19:50:36 +0000 (+0100)
Subject: Inverse output format check for run_shell()
X-Git-Tag: v25~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=158a54bf4409ddf52292e6125b9edc28bd42c946;p=thirdparty%2Fmkosi.git

Inverse output format check for run_shell()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 7913c24b3..1c1d98d99 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3871,10 +3871,10 @@ def run_sandbox(args: Args, config: Config) -> None:
 
 def run_shell(args: Args, config: Config) -> None:
     opname = "acquire shell in" if args.verb == Verb.shell else "boot"
-    if config.output_format in (OutputFormat.tar, OutputFormat.cpio):
-        die(f"Sorry, can't {opname} a {config.output_format} archive.")
+    if config.output_format not in (OutputFormat.directory, OutputFormat.disk):
+        die(f"Cannot {opname} {config.output_format} images with systemd-nspawn")
     if config.output_format.use_outer_compression() and config.compress_output:
-        die(f"Sorry, can't {opname} a compressed image.")
+        die(f"Cannot {opname} compressed {config.output_format} images with systemd-nspawn")
 
     cmdline: list[PathString] = ["systemd-nspawn", "--quiet", "--link-journal=no"]