From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Fri, 28 Feb 2025 21:30:06 +0000 (+0100)
Subject: Rename "storage" initrd profile to "lvm"
X-Git-Tag: v26~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f4b753c15ef268eeb9df02e24d42c521f155ca;p=thirdparty%2Fmkosi.git

Rename "storage" initrd profile to "lvm"

Since it actually only provides support for LVM, it's best to keep the different
specific functionalities separate.
---

diff --git a/REUSE.toml b/REUSE.toml
index 8b566d27f..37ae793f4 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -44,8 +44,8 @@ SPDX-License-Identifier = "LGPL-2.1-or-later"
 
 [[annotations]]
 path = [
-    "mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules",
-    "mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules",
+    "mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules",
+    "mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules",
 ]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "Mkosi Contributors"
diff --git a/mkosi.conf b/mkosi.conf
index 8d032d2b6..42c20e8b0 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -29,7 +29,7 @@ Packages=
         tmux
         zsh
 
-InitrdProfiles=storage
+InitrdProfiles=lvm
 InitrdPackages=
         less
 
diff --git a/mkosi/config.py b/mkosi/config.py
index a4d774e80..82d5a5e65 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -601,7 +601,7 @@ class ToolsTreeProfile(StrEnum):
 
 
 class InitrdProfile(StrEnum):
-    storage = enum.auto()
+    lvm = enum.auto()
 
 
 def expand_delayed_specifiers(specifiers: dict[str, str], text: str) -> str:
diff --git a/mkosi/resources/man/mkosi-initrd.1.md b/mkosi/resources/man/mkosi-initrd.1.md
index 01fd32195..59f1cd231 100644
--- a/mkosi/resources/man/mkosi-initrd.1.md
+++ b/mkosi/resources/man/mkosi-initrd.1.md
@@ -44,8 +44,7 @@ initrds and Unified Kernel Images for the current running system.
 :   Set the profiles to enable for the initrd. By default, all profiles are
     disabled.
 
-    The `storage` profile enables support for advanced storage mechanisms, which
-    currently is limited to LVM.
+    The `lvm` profile enables support for LVM.
 
 `--debug`
 :   Enable additional debugging output.
diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index fd995bf0b..49d8e0650 100644
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1021,8 +1021,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     comma-delimited list of profiles. By default, all profiles are
     disabled.
 
-    The `storage` profile enables support for advanced storage
-    mechanisms, which currently is limited to LVM.
+    The `lvm` profile enables support for LVM.
 
 `InitrdPackages=`, `--initrd-package=`
 :   Extra packages to install into the default initrd. Takes a comma
diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.conf
similarity index 100%
rename from mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.conf
rename to mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.conf
diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules b/mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules
similarity index 100%
rename from mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules
rename to mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules
diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules b/mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules
similarity index 100%
rename from mkosi/resources/mkosi-initrd/mkosi.profiles/storage/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules
rename to mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules
diff --git a/tests/test_json.py b/tests/test_json.py
index c44153c72..348ac8a0a 100644
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -197,7 +197,7 @@ def test_config() -> None:
                 "clevis"
             ],
             "InitrdProfiles": [
-                "storage"
+                "lvm"
             ],
             "InitrdVolatilePackages": [
                 "abc"
@@ -490,7 +490,7 @@ def test_config() -> None:
         image="main",
         incremental=Incremental.no,
         initrd_packages=["clevis"],
-        initrd_profiles=[InitrdProfile.storage],
+        initrd_profiles=[InitrdProfile.lvm],
         initrd_volatile_packages=["abc"],
         initrds=[Path("/efi/initrd1"), Path("/efi/initrd2")],
         kernel_command_line_extra=["look", "im", "on", "the", "kernel", "command", "line"],