Merge pull request #2508 from CodethinkLabs/richardmaw/shared-build-m…

…achine-fixes Misc fixes for running mkosi as root on a shared build machines
systemd · Mar 14, 2024 · b356e04 · b356e04
2 parents fff6f24 + f800ad9
commit b356e04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
@@ -4023,7 +4023,7 @@ def sync_repository_metadata(context: Context) -> None:
 
 def run_sync(args: Args, config: Config, *, resources: Path) -> None:
     if os.getuid() == 0:
-        os.setgroups([INVOKING_USER.gid])
+        os.setgroups(os.getgrouplist(INVOKING_USER.name(), INVOKING_USER.gid))
         os.setgid(INVOKING_USER.gid)
         os.setuid(INVOKING_USER.uid)
 

diff --git a/mkosi/config.py b/mkosi/config.py
@@ -1565,7 +1565,7 @@ def sandbox(
             relaxed=relaxed,
             scripts=scripts,
             tools=self.tools(),
-            options=[*options, *mounts],
+            options=[*mounts, *options],
         )