From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 17 Aug 2023 22:25:40 +0000 (+0200)
Subject: Make /boot/efi a symlink to /efi
X-Git-Tag: v16~52^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b21d73ce4f0f1d8da10080a4c81e6a7d5da8920;p=thirdparty%2Fmkosi.git

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 0737c7462..497033b23 100644
--- 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)