From: Michael A Cassaniti <michael@cassaniti.id.au>
Date: Thu, 21 Jul 2022 01:39:44 +0000 (+1000)
Subject: Fixed regression when using UsrOnly during initial install
X-Git-Tag: v14~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d3e36b28b2bca2cb7841ae1dd51882dbe744416;p=thirdparty%2Fmkosi.git

Fixed regression when using UsrOnly during initial install

Several distributions call `run_workspace_command()` during installation and
this now requires the root directory that gets bind mounted in to exist. The
created directory will be removed anyway since it exists under a temporary
workspace.

As an example, the documentation removal when installing a Debian derivative
will fail without this change.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 3a9625de4..9881099bf 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1841,7 +1841,7 @@ def prepare_tree(args: MkosiArgs, root: Path, do_run_build_script: bool, cached:
             root.joinpath("etc/kernel/entry-token").write_text(f"{args.machine_id}\n")
             root.joinpath("etc/kernel/install.conf").write_text("layout=bls\n")
 
-        if do_run_build_script or args.ssh:
+        if do_run_build_script or args.ssh or args.usr_only:
             root_home(args, root).mkdir(mode=0o750)
 
         if args.ssh and not do_run_build_script: