[rhel7-branch 9/9] dracut: fix boot failure waiting for finished/dd.sh

wgwoods installerbot-noreply at redhat.com
Thu Jul 9 15:18:37 UTC 2015


From: Will Woods <wwoods at redhat.com>

parse-anaconda-dd.sh was creating an (empty) /tmp/dd_todo if there was
nothing to do, but that tricked driver-updates-genrules.sh into thinking
there *was* something to do, so we time out waiting for the dd stuff to
finish.

This patch fixes that by ensuring the file is only created if there is
actually one or more tasks to complete.

Related: RHBZ#1084197
---
 dracut/parse-anaconda-dd.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dracut/parse-anaconda-dd.sh b/dracut/parse-anaconda-dd.sh
index ee65501..f94fbaf 100755
--- a/dracut/parse-anaconda-dd.sh
+++ b/dracut/parse-anaconda-dd.sh
@@ -25,4 +25,6 @@ for dd in $(getargs dd= inst.dd=); do
 done
 
 # for convenience's sake, mash 'em all into one list
-cat /tmp/dd_net /tmp/dd_disk /tmp/dd_interactive > /tmp/dd_todo
+for dd_f in /tmp/dd_interactive /tmp/dd_net /tmp/dd_disk; do
+    [ -f $dd_f ] && cat $dd_f >> /tmp/dd_todo
+done


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/93a60af7d6f8d12274c3f8f83d160997b01418ce


More information about the anaconda-patches mailing list