From be0730fcca708719ec136cbf6e7075ae62a641b3 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Fri, 4 Oct 2024 15:13:25 +0200
Subject: [PATCH] Use openSUSE everywhere

---
 .github/workflows/ci.yml            | 4 ++--
 mkosi.conf.d/20-opensuse/mkosi.conf | 2 +-
 mkosi/bootloader.py                 | 8 ++++----
 mkosi/distributions/opensuse.py     | 4 ++--
 mkosi/installer/rpm.py              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8153e84c..de94cc674 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -127,10 +127,10 @@ jobs:
           - ubuntu
           # TODO: Add CentOS once they have systemd v254 or newer.
         exclude:
-          # pacman and archlinux-keyring are not packaged in OpenSUSE.
+          # pacman and archlinux-keyring are not packaged in openSUSE.
           - distro: arch
             tools: opensuse
-          # apt, debian-keyring and ubuntu-keyring are not packaged in OpenSUSE.
+          # apt, debian-keyring and ubuntu-keyring are not packaged in openSUSE.
           - distro: debian
             tools: opensuse
           - distro: ubuntu
diff --git a/mkosi.conf.d/20-opensuse/mkosi.conf b/mkosi.conf.d/20-opensuse/mkosi.conf
index 2f03b111a..c56650c06 100644
--- a/mkosi.conf.d/20-opensuse/mkosi.conf
+++ b/mkosi.conf.d/20-opensuse/mkosi.conf
@@ -7,7 +7,7 @@ Distribution=opensuse
 Release=tumbleweed
 
 [Content]
-# OpenSUSE does not ship an unsigned shim
+# openSUSE does not ship an unsigned shim
 ShimBootloader=none
 Packages=
         diffutils
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
index 56962650c..2569a7d8c 100644
--- a/mkosi/bootloader.py
+++ b/mkosi/bootloader.py
@@ -150,7 +150,7 @@ def prepare_grub_config(context: Context) -> Optional[Path]:
 
     if want_grub_efi(context):
         # Signed EFI grub shipped by distributions reads its configuration from /EFI/<distribution>/grub.cfg
-        # (except in OpenSUSE) in the ESP so let's put a shim there to redirect to the actual configuration
+        # (except in openSUSE) in the ESP so let's put a shim there to redirect to the actual configuration
         # file.
         if context.config.distribution == Distribution.opensuse:
             earlyconfig = context.root / "efi/EFI/BOOT/grub.cfg"
@@ -246,7 +246,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
     patterns = [
         f"usr/lib/grub/*-signed/grub{arch}.efi.signed",  # Debian/Ubuntu
         f"boot/efi/EFI/*/grub{arch}.efi",  # Fedora/CentOS
-        "usr/share/efi/*/grub.efi",  # OpenSUSE
+        "usr/share/efi/*/grub.efi",  # openSUSE
     ]
 
     for p in flatten(context.root.glob(pattern) for pattern in patterns):
@@ -790,7 +790,7 @@ def install_shim(context: Context) -> None:
         f"usr/lib/shim/shim{arch}.efi.signed.latest",  # Ubuntu
         f"usr/lib/shim/shim{arch}.efi.signed",  # Debian
         f"boot/efi/EFI/*/shim{arch}.efi",  # Fedora/CentOS
-        "usr/share/efi/*/shim.efi",  # OpenSUSE
+        "usr/share/efi/*/shim.efi",  # openSUSE
     ]
 
     unsigned = [
@@ -805,7 +805,7 @@ def install_shim(context: Context) -> None:
         f"usr/lib/shim/mm{arch}.efi.signed",  # Debian
         f"usr/lib/shim/mm{arch}.efi",  # Ubuntu
         f"boot/efi/EFI/*/mm{arch}.efi",  # Fedora/CentOS
-        "usr/share/efi/*/MokManager.efi",  # OpenSUSE
+        "usr/share/efi/*/MokManager.efi",  # openSUSE
     ]
 
     unsigned = [
diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index 6ab0bf331..fe8c6f2b4 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -102,7 +102,7 @@ class Installer(DistributionInstaller):
 
             if not gpgkeys and not context.config.repository_key_fetch:
                 die(
-                    "OpenSUSE GPG keys not found in /usr/share/distribution-gpg-keys",
+                    "openSUSE GPG keys not found in /usr/share/distribution-gpg-keys",
                     hint="Make sure the distribution-gpg-keys package is installed",
                 )
 
@@ -241,7 +241,7 @@ class Installer(DistributionInstaller):
         }.get(arch)  # fmt: skip
 
         if not a:
-            die(f"Architecture {a} is not supported by OpenSUSE")
+            die(f"Architecture {a} is not supported by openSUSE")
 
         return a
 
diff --git a/mkosi/installer/rpm.py b/mkosi/installer/rpm.py
index 3f27a7d66..4e49d63d8 100644
--- a/mkosi/installer/rpm.py
+++ b/mkosi/installer/rpm.py
@@ -92,7 +92,7 @@ def setup_rpm(
             for plugin in plugindir.iterdir():
                 f.write(f"%__transaction_{plugin.stem} %{{nil}}\n")
 
-    # Write an rpm sequoia policy that allows SHA1 as various distribution GPG keys (OpenSUSE) still use SHA1
+    # Write an rpm sequoia policy that allows SHA1 as various distribution GPG keys (openSUSE) still use SHA1
     # for various things.
     # TODO: Remove when all rpm distribution GPG keys have stopped using SHA1.
     if not (p := context.sandbox_tree / "etc/crypto-policies/back-ends/rpm-sequoia.config").exists():
-- 
2.47.2