From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 28 Oct 2023 19:38:37 +0000 (+0200)
Subject: Don't mount our own passwd when building images
X-Git-Tag: v19~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84d068c28f21d05315d38846cf2b15843f90ec94;p=thirdparty%2Fmkosi.git

Don't mount our own passwd when building images

It's much more important that we use the image's /etc/passwd instead
of our own. Both inside and outside the image so that UIDs/GIDs get
resolved correctly.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0a6c0357c..7071a8a3d 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -448,7 +448,6 @@ def run_build_scripts(state: MkosiState) -> None:
 
     with (
         mount_build_overlay(state),\
-        mount_passwd(state.root),\
         mount_volatile_overlay(state),\
         finalize_chroot_scripts(state) as cd\
     ):
@@ -2614,7 +2613,6 @@ def run_verb(args: MkosiArgs, images: Sequence[MkosiConfig]) -> None:
         with (
             complete_step(f"Building {config.image or 'default'} image"),\
             mount_tools(config.tools_tree),\
-            mount_passwd(),\
             prepend_to_environ_path(config)\
         ):
             # After tools have been mounted, check if we have what we need