Make /boot/efi a symlink to /efi

Let's make sure all EFI stuff is installed to /efi by making
/boot/efi a symlink to /efi.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0737c7462a9f7432b3170ae8da97b89be23a8ed3..497033b230c5ad2ddd5438cdc2bbcfc55cbd3d64 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -143,6 +143,11 @@ def install_distribution(state: MkosiState) -> None:
             with umask(~0o500):
                 (state.root / "efi").mkdir(exist_ok=True)
 
+            # Some distributions install EFI binaries directly to /boot/efi. Let's redirect them to /efi
+            # instead.
+            rmtree(state.root / "boot/efi")
+            (state.root / "boot/efi").symlink_to("../efi")
+
             if state.config.packages:
                 state.config.distribution.install_packages(state, state.config.packages)