From: Harald Hoyer <harald@redhat.com>
Date: Fri, 25 Mar 2011 12:34:37 +0000 (+0100)
Subject: loginit: use /run/initramfs/init.log.end as end marker
X-Git-Tag: 009~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07fa164e163532998b5144b42f67277e52ad4e58;p=thirdparty%2Fdracut.git

loginit: use /run/initramfs/init.log.end as end marker
---

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 2b8cfd9d1..4e30e0ecf 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -17,9 +17,11 @@ wait_for_loginit()
         # wait for loginit
         i=0
         while [ $i -lt 10 ]; do 
-            j=$(jobs)
-            [ -z "$j" ] && break
-            [ -z "${j##*Running*}" ] || break
+            if [ -e /run/initramfs/init.log.end ]; then
+                j=$(jobs)
+                [ -z "$j" ] && break
+                [ -z "${j##*Running*}" ] || break
+            fi
             sleep 0.1
             i=$(($i+1))
         done    
@@ -33,7 +35,7 @@ wait_for_loginit()
         done
         set -x
     fi
-    rm -f /run/initramfs/initlog.pipe
+    rm -f /run/initramfs/initlog.pipe /run/initramfs/init.log.end
 }
 
 emergency_shell()
diff --git a/modules.d/99base/loginit b/modules.d/99base/loginit
index 3ceaedea5..5436b6b00 100755
--- a/modules.d/99base/loginit
+++ b/modules.d/99base/loginit
@@ -11,7 +11,10 @@ QUIET=$1
 exec 6>/init.log
 
 while read line; do 
-    [ "$line" = "DRACUT_LOG_END" ] && exit 0
+    if [ "$line" = "DRACUT_LOG_END" ]; then
+        > /run/initramfs/init.log.end
+        exit 0
+    fi
     echo "<7>dracut: $line" >&5
     # if "quiet" is specified we output to /dev/console
     [ -n "$QUIET" ] && echo "dracut: $line"