Skip to content

Commit 4ca9366

Browse files
authored
dracut: add fix for initrd not showing prompt when root device is locked (#10039) (#10066)
1 parent c841b33 commit 4ca9366

2 files changed

Lines changed: 30 additions & 1 deletion

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
See issue: https://github.com/dracut-ng/dracut-ng/issues/492
2+
3+
This reverts commit 2339acfaeee60d6bb26a1103db2e53bc8f9cb2d1
4+
5+
Signed-off by: Thien Trung Vuong <tvuong@microsoft.com>
6+
---
7+
modules.d/90crypt/parse-crypt.sh | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
11+
index 9567a4a9..e46e347a 100755
12+
--- a/modules.d/90crypt/parse-crypt.sh
13+
+++ b/modules.d/90crypt/parse-crypt.sh
14+
@@ -174,7 +174,7 @@ else
15+
} >> "$hookdir/emergency/90-crypt.sh"
16+
fi
17+
done
18+
- elif getargbool 1 rd.auto; then
19+
+ elif getargbool 0 rd.auto; then
20+
if [ -z "$DRACUT_SYSTEMD" ]; then
21+
{
22+
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
23+
--
24+
2.42.0
25+

SPECS/dracut/dracut.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: dracut to create initramfs
55
Name: dracut
66
Version: 102
7-
Release: 1%{?dist}
7+
Release: 2%{?dist}
88
# The entire source code is GPLv2+
99
# except install/* which is LGPLv2+
1010
License: GPLv2+ AND LGPLv2+
@@ -34,6 +34,7 @@ Patch: 0006-dracut.sh-validate-instmods-calls.patch
3434
Patch: 0007-feat-dracut.sh-support-multiple-config-dirs.patch
3535
Patch: 0011-Remove-reference-to-kernel-module-zlib-in-fips-module.patch
3636
Patch: 0012-fix-dracut-functions-avoid-awk-in-get_maj_min.patch
37+
Patch: 0013-revert-fix-crypt-unlock-encrypted-devices-by-default.patch
3738

3839
BuildRequires: bash
3940
BuildRequires: kmod-devel
@@ -276,6 +277,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
276277
%dir %{_sharedstatedir}/%{name}/overlay
277278

278279
%changelog
280+
* Tue Aug 06 2024 Thien Trung Vuong <tvuong@microsoft.com> - 102-2
281+
- Add fix for initrd not showing prompt when root device is locked
282+
279283
* Tue Jun 25 2024 Cameron Baird <cameronbaird@microsoft.com> - 102-1
280284
- Update to 102
281285

0 commit comments

Comments
 (0)