Get rid of kernel_command_line() in DistributionInstaller

Let's just let anyone using CentOS 8 Stream set rw themselves.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 520edd15b1f37bc1145aee7f8f2a0023c0c402bb..92f6a87a26b04f3652d0a81361072f3526609acd 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -917,8 +917,6 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
             else:
                 cmdline = []
 
-            cmdline += state.installer.kernel_command_line(state)
-
             if roothash:
                 cmdline += [roothash]
 

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index 51f51b3566ae0f7f7329d6e9a1f20f9f8d58a9c1..a5326e80e1f1e2629cb562a11ded6d9b6d247b8e 100644 (file)
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -35,10 +35,6 @@ class DistributionInstaller:
     def filesystem_options(cls, state: "MkosiState") -> dict[str, list[str]]:
         return {}
 
-    @staticmethod
-    def kernel_command_line(state: "MkosiState") -> list[str]:
-        return []
-
     @staticmethod
     def architecture(arch: Architecture) -> str:
         raise NotImplementedError()

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 0c6533e3d96748cd70f16195e99581cc8474d181..67063fbd875c8718d05dc3916acf17cf92943de9 100644 (file)
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -64,18 +64,6 @@ class CentosInstaller(DistributionInstaller):
             },
         }.get(state.config.release, {})
 
-    @staticmethod
-    def kernel_command_line(state: MkosiState) -> list[str]:
-        kcl = []
-
-        # systemd-gpt-auto-generator only started applying the GPT partition read-only flag to gpt-auto
-        # mounts from v240 onwards, while CentOS Stream 8 ships systemd v239, so we have to nudge gpt-auto to
-        # mount the root partition rw by default.
-        if int(state.config.release) <= 8:
-            kcl += ["rw"]
-
-        return kcl + DistributionInstaller.kernel_command_line(state)
-
     @classmethod
     def install(cls, state: MkosiState) -> None:
         # Make sure glibc-minimal-langpack is installed instead of glibc-all-langpacks.