[3.0] dracut: patch for systemd-cryptsetup module to be included (#12827)

Author: arc9693

SPECS/dracut/dracut.spec

@@ -4,7 +4,7 @@
 Summary:        dracut to create initramfs
 Name:           dracut
 Version:        102
-Release:        11%{?dist}
+Release:        12%{?dist}
 # The entire source code is GPLv2+
 # except install/* which is LGPLv2+
 License:        GPLv2+ AND LGPLv2+
@@ -56,6 +56,16 @@ Patch:          0014-fix-systemd-pcrphase-in-hostonly-mode-do-not-try-to-include
 Patch:          0015-fix-systemd-pcrphase-make-tpm2-tss-an-optional-dependency.patch
 Patch:          0016-Handle-SELinux-configuration-for-overlayfs-folders.patch
 Patch:          avoid-mktemp-collisions-with-find-not-path.patch
+# fix-dracut-systemd-include-systemd-cryptsetup.patch has been introduced  
+# by the Azure Linux team to ensure that the systemd-cryptsetup module is included  
+# in the initramfs when needed.  
+# In dracut 102, systemd-cryptsetup was split from the crypt module and is no longer  
+# included by default, causing encrypted volumes in crypttab to be skipped in initrd.  
+# This patch modifies dracut-systemd to explicitly include systemd-cryptsetup.  
+# The patch can be removed if Dracut is upgraded to 104+.
+# - References: https://github.com/dracut-ng/dracut-ng/pull/262  
+#               https://github.com/dracut-ng/dracut-ng/commit/e0e5424a7b5e387ccb70e47ffea5a59716bf7b76  
+Patch:          fix-dracut-systemd-include-systemd-cryptsetup.patch
 
 BuildRequires:  bash
 BuildRequires:  kmod-devel
@@ -315,6 +325,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
 %dir %{_sharedstatedir}/%{name}/overlay
 
 %changelog
+* Tue Mar 11 2025 Archana Choudhary <archana1@microsoft.com> - 102-12
+- Add fix for systemd-cryptsetup module to be included in initramfs when needed
+
 * Mon Mar 05 2025 George Mileka <gmileka@microsoft.com> - 102-11
 - Update overlayfs selinux handling with the full path of chcon
 

SPECS/dracut/fix-dracut-systemd-include-systemd-cryptsetup.patch

@@ -0,0 +1,33 @@
+From e0e5424a7b5e387ccb70e47ffea5a59716bf7b76 Mon Sep 17 00:00:00 2001
+From: Jo Zzsi <jozzsicsataban@gmail.com>
+Date: Wed, 28 Aug 2024 23:06:08 -0400
+Subject: [PATCH] fix(dracut-systemd): include systemd-cryptsetup module when
+ needed
+
+---
+ modules.d/98dracut-systemd/module-setup.sh | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh
+index 0ea26d425..6b8f42ae3 100755
+--- a/modules.d/98dracut-systemd/module-setup.sh
++++ b/modules.d/98dracut-systemd/module-setup.sh
+@@ -12,7 +12,17 @@ check() {
+ 
+ # called by dracut
+ depends() {
+-    echo "systemd-initrd systemd-ask-password"
++    local deps
++    deps="systemd-initrd systemd-ask-password"
++
++    # when systemd and crypt are both included
++    # systemd-cryptsetup is mandatory dependency
++    # see https://github.com/dracut-ng/dracut-ng/issues/563
++    if dracut_module_included "crypt"; then
++        deps+=" systemd-cryptsetup"
++    fi
++
++    echo "$deps"
+     return 0
+ }
+