]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Move grub-bios-setup shell setup command to sandbox
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 4 Apr 2024 18:28:34 +0000 (20:28 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 4 Apr 2024 18:28:34 +0000 (20:28 +0200)
mkosi/__init__.py

index af8d59c618f7d8fc2c654ab0e99e9654a5575f55..f3af47c332d5cac9b6025049417cd794b9c2be04 100644 (file)
@@ -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 \"$@\""],
         )