From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 14 Aug 2023 16:46:36 +0000 (+0200)
Subject: Run with --offline=no when Subvolumes= is used in repart definition files
X-Git-Tag: v16~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a827b155747fca269579eead60457de6454f96;p=thirdparty%2Fmkosi.git

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

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9bffb9192..ee69cfda0 100644
--- 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():