Merge pull request #3766 from aafeijoo-suse/initrd-profiles-network-nfs

Add "nfs" (and "network") initrd profiles

Author: behrmann

mkosi/config.py

@@ -639,6 +639,8 @@ def default(cls) -> tuple["ToolsTreeProfile", ...]:
 
 class InitrdProfile(StrEnum):
     lvm = enum.auto()
+    network = enum.auto()
+    nfs = enum.auto()
     pkcs11 = enum.auto()
     plymouth = enum.auto()
     raid = enum.auto()

mkosi/initrd.py

@@ -196,6 +196,24 @@ def process_crypttab(staging_dir: Path) -> list[str]:
     return cmdline
 
 
+def network_config() -> list[str]:
+    return [
+        f"--extra-tree={f}:{f}"
+        for f in (
+            "/etc/systemd/network",
+            "/etc/systemd/networkd.conf",
+            "/etc/systemd/networkd.conf.d",
+            "/etc/systemd/resolved.conf",
+            "/etc/systemd/resolved.conf.d",
+        )
+        if Path(f).exists()
+    ]
+
+
+def nfs_config() -> list[str]:
+    return [f"--extra-tree={f}:{f}" for f in ("/etc/idmapd.conf", "/etc/idmapd.conf.d") if Path(f).exists()]
+
+
 def raid_config() -> list[str]:
     return [
         f"--extra-tree={f}:{f}"
@@ -333,7 +351,11 @@ def main() -> None:
 
         for p in args.profile:
             cmdline += ["--profile", p]
-            if p == "raid":
+            if p == "network":
+                cmdline += network_config()
+            elif p == "nfs":
+                cmdline += nfs_config()
+            elif p == "raid":
                 cmdline += raid_config()
 
         if args.kernel_image:

mkosi/resources/man/mkosi-initrd.1.md

@@ -45,6 +45,9 @@ initrds and Unified Kernel Images for the current running system.
     disabled.
 
     The `lvm` profile enables support for LVM.
+    The `network` profile enables support for network via **systemd-networkd**.
+    The `nfs` profile enables support for NFS. It requires networking in the
+    initrd, using the `network` profile, or some other custom method.
     The `pkcs11` profile enables support for PKCS#11.
     The `plymouth` profile provides a graphical interface at boot (animation and
     password prompt).

mkosi/resources/man/mkosi.1.md

@@ -1053,6 +1053,9 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     disabled.
 
     The `lvm` profile enables support for LVM.
+    The `network` profile enables support for network via **systemd-networkd**.
+    The `nfs` profile enables support for NFS. It requires networking in the
+    initrd, using the `network` profile, or some other custom method.
     The `pkcs11` profile enables support for PKCS#11.
     The `plymouth` profile provides a graphical interface at boot (animation and
     password prompt).

mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf

@@ -14,6 +14,7 @@ Packages=
         libfido2
         tpm2-tss
 
+        procps-ng
         util-linux
 
 RemoveFiles=

mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf

@@ -17,3 +17,5 @@ Packages=
         e2fsprogs
         xfsprogs
         dosfstools
+
+        procps-ng

mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf

@@ -18,6 +18,7 @@ Packages=
         e2fsprogs
         dosfstools
 
+        procps
         util-linux
 
         # Various libraries that are dlopen'ed by systemd

mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf

@@ -27,6 +27,7 @@ Packages=
         xfsprogs
         dosfstools
 
+        procps
         util-linux
 
 RemovePackages=

mkosi/resources/mkosi-initrd/mkosi.profiles/network/mkosi.conf.d/systemd-networkd.conf

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|fedora
+Distribution=|opensuse
+
+[Content]
+Packages=systemd-networkd

mkosi/resources/mkosi-initrd/mkosi.profiles/network/mkosi.conf.d/systemd-resolved.conf

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=!arch
+
+[Content]
+Packages=systemd-resolved