From 7eb40c488c33aa1c80d9cf79d7264de9f89013f2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 12 Apr 2011 11:03:57 +0200
Subject: [PATCH] base: s#initlog#loginit#g for consistency

---
 modules.d/40network/dhclient-script |  2 +-
 modules.d/40network/ifup            |  2 +-
 modules.d/95fcoe/fcoe-up            |  2 +-
 modules.d/99base/init               | 14 +++++++-------
 modules.d/99base/loginit            |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index 49eabdd..f9a0103 100755
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -47,7 +47,7 @@ setup_interface() {
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
 export PS4="dhclient.$interface.$$ + "
-exec >>/run/initramfs/initlog.pipe 2>>/run/initramfs/initlog.pipe
+exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # We already need a set netif here
diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index f1a3dd7..47cec34 100755
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -81,7 +81,7 @@ do_static() {
 }
 
 export PS4="ifup.$1.$$ + "
-exec >>/run/initramfs/initlog.pipe 2>>/run/initramfs/initlog.pipe
+exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 # Huh? No $1?
diff --git a/modules.d/95fcoe/fcoe-up b/modules.d/95fcoe/fcoe-up
index a81f014..da69c52 100755
--- a/modules.d/95fcoe/fcoe-up
+++ b/modules.d/95fcoe/fcoe-up
@@ -14,7 +14,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 [ -z "$1" -o -z "$2" ] && exit 1
 
 export PS4="fcoe-up.$1.$$ + "
-exec >>/run/initramfs/initlog.pipe 2>>/run/initramfs/initlog.pipe
+exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 netif=$1
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 740085a..f0445e7 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -12,13 +12,13 @@ wait_for_loginit()
 {
     set +x
     [ "$RD_DEBUG" = "yes" ] || return
-    [ -e /run/initramfs/initlog.pipe ] || return
+    [ -e /run/initramfs/loginit.pipe ] || return
     echo "DRACUT_LOG_END"
     exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
         # wait for loginit
     i=0
     while [ $i -lt 10 ]; do 
-        if [ ! -e /run/initramfs/initlog.pipe ]; then
+        if [ ! -e /run/initramfs/loginit.pipe ]; then
             j=$(jobs)
             [ -z "$j" ] && break
             [ -z "${j##*Running*}" ] || break
@@ -29,11 +29,11 @@ wait_for_loginit()
 
     if [ $i -eq 10 ]; then
         kill %1 >/dev/null 2>&1
-        kill $(while read line;do echo $line;done</run/initramfs/initlog.pid)
+        kill $(while read line;do echo $line;done</run/initramfs/loginit.pid)
     fi
 
     set -x
-    rm -f /run/initramfs/initlog.pipe /run/initramfs/initlog.pid
+    rm -f /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
 }
 
 emergency_shell()
@@ -143,9 +143,9 @@ cp -ar /var/run.bak/* /run/ 2>/dev/null
 cp -ar /var/lock.bak/* /run/lock/ 2>/dev/null
 
 if [ "$RD_DEBUG" = "yes" ]; then
-    mkfifo /run/initramfs/initlog.pipe
-    loginit $DRACUT_QUIET </run/initramfs/initlog.pipe >/dev/console 2>&1 &
-    exec >/run/initramfs/initlog.pipe 2>&1
+    mkfifo /run/initramfs/loginit.pipe
+    loginit $DRACUT_QUIET </run/initramfs/loginit.pipe >/dev/console 2>&1 &
+    exec >/run/initramfs/loginit.pipe 2>&1
 else
     exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
 fi
diff --git a/modules.d/99base/loginit b/modules.d/99base/loginit
index 48db9c8..d20912d 100755
--- a/modules.d/99base/loginit
+++ b/modules.d/99base/loginit
@@ -14,7 +14,7 @@ exec 6>/run/initramfs/init.log
 
 while read line; do 
     if [ "$line" = "DRACUT_LOG_END" ]; then
-        rm -f /run/initramfs/initlog.pipe
+        rm -f /run/initramfs/loginit.pipe
         exit 0
     fi
     echo "<31>dracut: $line" >&5
-- 
2.7.4