From: Jörg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 21 Sep 2022 09:12:13 +0000 (+0200)
Subject: Merge pull request #1190 from DaanDeMeyer/drop-nspawn-executable
X-Git-Tag: v14~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93e3693eda86f1a69fb240295f5d9c4a535698f8;p=thirdparty%2Fmkosi.git

Merge pull request #1190 from DaanDeMeyer/drop-nspawn-executable

Allow single files to be used with --extra-search-paths
---

93e3693eda86f1a69fb240295f5d9c4a535698f8
diff --cc mkosi/__init__.py
index 0afc9ef19,9efcef65c..681df533d
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@@ -7532,8 -7534,11 +7532,8 @@@ def run_shell_cmdline(config: MkosiConf
      else:
          target = f"--image={config.output}"
  
-     cmdline = [nspawn_executable(), "--quiet", target]
+     cmdline = ["systemd-nspawn", "--quiet", target]
  
 -    if config.read_only:
 -        cmdline += ["--read-only"]
 -
      # If we copied in a .nspawn file, make sure it's actually honoured
      if config.nspawn_settings is not None:
          cmdline += ["--settings=trusted"]