[dracut/f20] dracut-034-64.git20131205

[Harald Hoyer]

commit bc859e10e4c606de4d3addfc62c5977a57f087d6
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Dec 5 18:49:12 2013 +0100

    dracut-034-64.git20131205
    
    - fixed failing the boot while waiting for password input

 0062-TODO-update.patch                             |   21 ++++++++++++++++
 ...cut-initqueue.sh-fixed-waiting-in-the-loo.patch |   25 ++++++++++++++++++++
 dracut.spec                                        |    7 ++++-
 3 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/0062-TODO-update.patch b/0062-TODO-update.patch
new file mode 100644
index 0000000..319d282
--- /dev/null
+++ b/0062-TODO-update.patch
@@ -0,0 +1,21 @@
+From ce052202f0cdb673536999a7d7810bd3a3a2aaca Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 5 Dec 2013 18:38:23 +0100
+Subject: [PATCH] TODO: update
+
+---
+ TODO | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/TODO b/TODO
+index 4e52fbf..875541d 100644
+--- a/TODO
++++ b/TODO
+@@ -22,6 +22,7 @@ INITRAMFS TODO
+ 
+ GENERATOR TODO
+ 
++- report errors on missing files in check()
+ - remove wait for swap devs, if no "resume=" is given on the kernel command line
+ - add presets (predefined set of modules)
+ - add interpreter/plugin-scripts to be sourced at the beginning or end (can use dracut-functions)
diff --git a/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch b/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch
new file mode 100644
index 0000000..1b4c841
--- /dev/null
+++ b/0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch
@@ -0,0 +1,25 @@
+From 3934ca8e6c0e80ecb32a2ed9403321afd510842e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 5 Dec 2013 18:38:35 +0100
+Subject: [PATCH] systemd/dracut-initqueue.sh: fixed waiting in the loop if PW
+ asked
+
+continue the main loop instead of the for loop, if a password is
+currently asked
+---
+ modules.d/98systemd/dracut-initqueue.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
+index 64e8154..1e05dcd 100755
+--- a/modules.d/98systemd/dracut-initqueue.sh
++++ b/modules.d/98systemd/dracut-initqueue.sh
+@@ -53,7 +53,7 @@ while :; do
+     sleep 0.5
+ 
+     for i in /run/systemd/ask-password/ask.*; do
+-        [ -e "$i" ] && continue
++        [ -e "$i" ] && continue 2
+     done
+ 
+     if [ $main_loop -gt $((2*$RDRETRY/3)) ]; then
diff --git a/dracut.spec b/dracut.spec
index 02dd1a3..5a37d89 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 034
-Release: 62.git20131205%{?dist}
+Release: 64.git20131205%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -90,6 +90,8 @@ Patch58: 0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch
 Patch59: 0059-i18n-introduce-i18n_install_all-to-install-everythin.patch
 #Patch60: 0060-dracut.spec-add-new-modules.patch
 #Patch61: 0061-dracut.spec-remove-suse-man-pages.patch
+#Patch62: 0062-TODO-update.patch
+Patch63: 0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch
 
 
 BuildRequires: bash git
@@ -513,6 +515,9 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Dec 05 2013 Harald Hoyer <harald at redhat.com> 034-64.git20131205
+- fixed failing the boot while waiting for password input
+
 * Thu Dec 05 2013 Harald Hoyer <harald at redhat.com> 034-62.git20131205
 - fixed PATH shortener
 - also install /etc/system-fips in the initramfs