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 8b566d27f3d0bfd95d9324dad528f00ff1229b33..37ae793f41305ee7f5f6c1d2ed953076ed8008f4 100644 (file)
--- 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 8d032d2b6857ca3d83ed53698793740a14872cc2..42c20e8b0f7316e2b8f3efac4b91e35cc73b3b2b 100644 (file)
--- 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 a4d774e80bea15c90abf233ccd8d36d59acead29..82d5a5e65f3c77d6d13fc78ebd2e5c9c9dac2889 100644 (file)
--- 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 01fd321955aa305f878ae91d7d9b3841bce5630e..59f1cd2315cf53ce1d9bc82543aed147f3b4f2a2 100644 (file)
--- 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 fd995bf0b40f17fbaf60e9ba42a878e9617f1612..49d8e0650c721cf1f6d735839bf2735863395614 100644 (file)
--- 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 c44153c7281df638eda9b74a3b9adaa8f06f353c..348ac8a0a238fed84b195647d976407186218321 100644 (file)
--- 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"],