[packages/dracut] Do not panic when LUKS password is not early enough

jajcus jajcus at pld-linux.org
Sat Jan 11 15:16:22 CET 2014


commit 3f8180f5dd75e77084d437fa484af1a59ec08b62
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sat Jan 11 15:15:04 2014 +0100

    Do not panic when LUKS password is not early enough
    
    Fix from:
    http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=7e4f74f5040fc3f4e7646695b54c5c11b0b95c62
    http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=3934ca8e6c0e80ecb32a2ed9403321afd510842e
    
    Problem described here:
    https://bugzilla.redhat.com/show_bug.cgi?id=868421
    
    Release: 2

 dracut-luks_password_wait.patch | 14 ++++++++++++++
 dracut.spec                     |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/dracut.spec b/dracut.spec
index b9abbe1..cc6db62 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,7 +2,7 @@ Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
 Version:	034
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Base
 Source0:	http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -14,6 +14,7 @@ Patch3:		plymouth-logo.patch
 Patch4:		arch-libdir.patch
 Patch5:		systemd-paths.patch
 Patch6:		prelink-libs.patch
+Patch7:		dracut-luks_password_wait.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
@@ -194,6 +195,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/95resume/module-setup.sh
diff --git a/dracut-luks_password_wait.patch b/dracut-luks_password_wait.patch
new file mode 100644
index 0000000..0173bb2
--- /dev/null
+++ b/dracut-luks_password_wait.patch
@@ -0,0 +1,14 @@
+diff -dur dracut-034.orig/modules.d/98systemd/dracut-initqueue.sh dracut-034/modules.d/98systemd/dracut-initqueue.sh
+--- dracut-034.orig/modules.d/98systemd/dracut-initqueue.sh	2013-10-08 09:55:26.000000000 +0200
++++ dracut-034/modules.d/98systemd/dracut-initqueue.sh	2014-01-11 15:02:54.852353296 +0100
+@@ -52,6 +52,10 @@
+     # no more udev jobs and queues empty.
+     sleep 0.5
+ 
++    for i in /run/systemd/ask-password/ask.*; do
++        [ -e "$i" ] && continue 2
++    done
++
+     if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then
+         for job in $hookdir/initqueue/timeout/*.sh; do
+             [ -e "$job" ] || break
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/3f8180f5dd75e77084d437fa484af1a59ec08b62



More information about the pld-cvs-commit mailing list