name squashfs images as .raw too

This is expected by systemd when used with RootImage= and friends

diff --git a/NEWS.md b/NEWS.md
index d92ef976825a15a9791a94518a14918c9e94e948..dd2d2a4fd73b1f6978cb7a72cd7b5cda8ffb3020 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -17,6 +17,7 @@ time.
 - The preferred names for mkosi configuration files and directories are now mkosi.conf
 and mkosi.conf.d/ respectively. The old names (mkosi.default and mkosi.default.d) have
 been removed from the docs but are still supported for backwards compatibility.
+- `plain_squashfs` type images will now also be named with a `.raw` suffix.
 
 ## v13
 

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9d0c8c424571f0cbfb013d35cf765096bfb989f6..5848d03df702e4a12ab6ae6a517a8d93b02c8678 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -6485,6 +6485,8 @@ def load_args(args: argparse.Namespace) -> MkosiArgs:
             output = f"{prefix}.tar.xz"
         elif args.output_format == OutputFormat.cpio:
             output = f"{prefix}.cpio" + (f".{args.compress}" if args.compress else "")
+        elif args.output_format.is_squashfs():
+            output = f"{prefix}.raw"
         else:
             output = prefix
         args.output = Path(output)