From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 26 Aug 2024 09:16:47 +0000 (+0200)
Subject: Rework grub conditions
X-Git-Tag: v25~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3359cff007c1d325fceaa6fd3e761e690f689815;p=thirdparty%2Fmkosi.git

Rework grub conditions

- Use -o instead of || as it's unclear whether || is supported or not
- Use quotes more
- Use [ ] as alias for test

Fixes #2974
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 8b91d9af6..774bfff5c 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2425,16 +2425,16 @@ def install_type1(
             cmdline = [root] + cmdline
 
         with config.open("a") as f:
-            f.write("if ")
+            f.write("if [ ")
 
             conditions = []
             if want_grub_efi(context) and not want_uki(context):
-                conditions += ['[ "${grub_platform}" = efi ]']
+                conditions += ['"${grub_platform}" == "efi"']
             if want_grub_bios(context, partitions):
-                conditions += ['[ "${grub_platform}" = pc ]']
+                conditions += ['"${grub_platform}" == "pc"']
 
-            f.write(" || ".join(conditions))
-            f.write("; then\n")
+            f.write(" -o ".join(conditions))
+            f.write(" ]; then\n")
 
             f.write(
                 textwrap.dedent(
@@ -2542,7 +2542,7 @@ def install_uki(context: Context, kver: str, kimg: Path, token: str, partitions:
         assert config
 
         with config.open("a") as f:
-            f.write('if [ "${grub_platform}" = efi ]; then\n')
+            f.write('if [ "${grub_platform}" == "efi" ]; then\n')
 
             f.write(
                 textwrap.dedent(