From 645bde35d300f950235684b587aea02ae579026e Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@redhat.com>
Date: Mon, 27 Jul 2009 15:54:21 -0400
Subject: [PATCH] Use standard ifcfg filenames, put them into an ifcfg
 directory.

---
 modules.d/40network/write-ifcfg.sh | 39 +++++++++++++++---------------
 modules.d/99base/init              |  1 +
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/modules.d/40network/write-ifcfg.sh b/modules.d/40network/write-ifcfg.sh
index 7da99598..4590be90 100755
--- a/modules.d/40network/write-ifcfg.sh
+++ b/modules.d/40network/write-ifcfg.sh
@@ -8,42 +8,43 @@ udevadm settle --timeout=30
 read IFACES < /tmp/net.ifaces
 
 for netif in $IFACES ; do
+    mkdir -p /tmp/ifcfg/
     # bridge?
     unset bridge
     if [ "$netif" = "$bridgename" ]; then
         bridge=yes
     fi
     cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
-    echo "# Generated by dracut initrd" > /tmp/net.$netif.ifcfg
-    echo "DEVICE=$netif" >> /tmp/net.$netif.ifcfg
-    echo "ONBOOT=yes" >> /tmp/net.$netif.ifcfg
+    echo "# Generated by dracut initrd" > /tmp/ifcfg/ifcfg-$netif
+    echo "DEVICE=$netif" >> /tmp/ifcfg/ifcfg-$netif
+    echo "ONBOOT=yes" >> /tmp/ifcfg/ifcfg-$netif
     if [ -f /tmp/net.$netif.lease ]; then
-	echo "BOOTPROTO=dhcp" >> /tmp/net.$netif.ifcfg
+	echo "BOOTPROTO=dhcp" >> /tmp/ifcfg/ifcfg-$netif
     else
-	echo "BOOTPROTO=none" >> /tmp/net.$netif.ifcfg
+	echo "BOOTPROTO=none" >> /tmp/ifcfg/ifcfg-$netif
         # If we've booted with static ip= lines, the override file is there
 	. /tmp/net.$netif.override 
-	echo "IPADDR=$ip" >> /tmp/net.$netif.ifcfg
-	echo "NETMASK=$mask" >> /tmp/net.$netif.ifcfg
-	[ -n "$gw" ] && echo "GATEWAY=$gw" >> /tmp/net.$netif.ifcfg
+	echo "IPADDR=$ip" >> /tmp/ifcfg/ifcfg-$netif
+	echo "NETMASK=$mask" >> /tmp/ifcfg/ifcfg-$netif
+	[ -n "$gw" ] && echo "GATEWAY=$gw" >> /tmp/ifcfg/ifcfg-$netif
     fi
 
     # bridge needs differente things written to ifcfg
     if [ -z "$bridge" ]; then
         # standard interface
-        echo "HWADDR=$(cat /sys/class/net/$netif/address)" >> /tmp/net.$netif.ifcfg
-        echo "TYPE=Ethernet" >> /tmp/net.$netif.ifcfg
-        echo "NAME=\"Boot Disk\"" >> /tmp/net.$netif.ifcfg
+        echo "HWADDR=$(cat /sys/class/net/$netif/address)" >> /tmp/ifcfg/ifcfg-$netif
+        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$netif
+        echo "NAME=\"Boot Disk\"" >> /tmp/ifcfg/ifcfg-$netif
     else
         # bridge
-	echo "TYPE=Bridge" >> /tmp/net.$netif.ifcfg
-        echo "NAME=\"Boot Disk\"" >> /tmp/net.$netif.ifcfg
+	echo "TYPE=Bridge" >> /tmp/ifcfg/ifcfg-$netif
+        echo "NAME=\"Boot Disk\"" >> /tmp/ifcfg/ifcfg-$netif
         # write separate ifcfg file for the raw eth interface
-        echo "DEVICE=$ethname" >> /tmp/net.$ethname.ifcfg
-        echo "TYPE=Ethernet" >> /tmp/net.$ethname.ifcfg
-        echo "ONBOOT=yes" >> /tmp/net.$ethname.ifcfg
-        echo "HWADDR=$(cat /sys/class/net/$ethname/address)" >> /tmp/net.$ethname.ifcfg
-        echo "BRIDGE=$netif" >> /tmp/net.$ethname.ifcfg
-        echo "NAME=$ethname" >> /tmp/net.$ethname.ifcfg
+        echo "DEVICE=$ethname" >> /tmp/ifcfg/ifcfg-$ethname
+        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-$ethname
+        echo "ONBOOT=yes" >> /tmp/ifcfg/ifcfg-$ethname
+        echo "HWADDR=$(cat /sys/class/net/$ethname/address)" >> /tmp/ifcfg/ifcfg-$ethname
+        echo "BRIDGE=$netif" >> /tmp/ifcfg/ifcfg-$ethname
+        echo "NAME=$ethname" >> /tmp/ifcfg/ifcfg-$ethname
     fi
 done
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 36f1a078..485cc2da 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -223,6 +223,7 @@ if getarg rdcopystate; then
     cp /tmp/* /dev/.initramfs/ >/dev/null 2>&1
 else
     cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
+    cp -a /tmp/ifcfg/ /dev/.initramfs/ >/dev/null 2>&1
 fi
 
 exec switch_root "$NEWROOT" "$INIT" $initargs || {