Run with --offline=no when Subvolumes= is used in repart definition files

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9bffb91923b9835bcebb9c21b60b0c1332368dc5..ee69cfda0a880fda5dd3537a02d1d4ac068c3ed3 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1345,6 +1345,12 @@ def make_image(state: MkosiState, skip: Sequence[str] = [], split: bool = False)
     if state.config.repart_dirs:
         for d in state.config.repart_dirs:
             cmdline += ["--definitions", d]
+
+        # Subvolumes= only works with --offline=no.
+        grep = run(["grep", "--recursive", "--include=*.conf", "Subvolumes=", *state.config.repart_dirs],
+                   stdout=subprocess.DEVNULL, check=False)
+        if grep.returncode == 0:
+            cmdline += ["--offline=no"]
     else:
         definitions = state.workspace / "repart-definitions"
         if not definitions.exists():