From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 4 Apr 2024 18:28:34 +0000 (+0200)
Subject: Move grub-bios-setup shell setup command to sandbox
X-Git-Tag: v23~29^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04998c152b446c2d247e795c8cdd248ed0cc89aa;p=thirdparty%2Fmkosi.git

Move grub-bios-setup shell setup command to sandbox
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index af8d59c61..f3af47c33 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1462,7 +1462,6 @@ def grub_bios_setup(context: Context, partitions: Sequence[Partition]) -> None:
         # be able to do the mount and we don't know the pid beforehand.
         run(
             [
-                "sh", "-c", f"mount --bind {mountinfo.name} /proc/$$/mountinfo && exec $0 \"$@\"",
                 setup,
                 "--directory", "/grub",
                 context.staging / context.config.output_with_format,
@@ -1473,7 +1472,7 @@ def grub_bios_setup(context: Context, partitions: Sequence[Partition]) -> None:
                     Mount(context.staging, context.staging),
                     Mount(mountinfo.name, mountinfo.name),
                 ],
-            ),
+            ) + ["sh", "-c", f"mount --bind {mountinfo.name} /proc/$$/mountinfo && exec $0 \"$@\""],
         )