]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Merge pull request #1190 from DaanDeMeyer/drop-nspawn-executable
authorJörg Behrmann <behrmann@physik.fu-berlin.de>
Wed, 21 Sep 2022 09:12:13 +0000 (11:12 +0200)
committerGitHub <noreply@github.com>
Wed, 21 Sep 2022 09:12:13 +0000 (11:12 +0200)
Allow single files to be used with --extra-search-paths

1  2 
mkosi/__init__.py
mkosi/backend.py

index 0afc9ef1916f06059787952282da0ea86cb8e91b,9efcef65c73bb7763f9c5d22dad6d6ba7cc9269f..681df533de079b1b5d64e8ca54f9f9f59f449615
@@@ -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"]
Simple merge