Blame 0001-Generate-correct-ifcfg-file-for-vlan-option.patch

Harald Hoyer 650a10
From 030b00b8a5499a1d2150730ae412a356f40ca5a4 Mon Sep 17 00:00:00 2001
Harald Hoyer 650a10
From: Radek Vykydal <rvykydal@redhat.com>
Harald Hoyer 650a10
Date: Wed, 31 Jul 2013 15:18:20 +0200
Harald Hoyer 650a10
Subject: [PATCH] Generate correct ifcfg file for vlan= option.
Harald Hoyer 650a10
Harald Hoyer 650a10
---
Harald Hoyer 650a10
 modules.d/45ifcfg/write-ifcfg.sh | 18 +++++++++++++++++-
Harald Hoyer 650a10
 1 file changed, 17 insertions(+), 1 deletion(-)
Harald Hoyer 650a10
Harald Hoyer 650a10
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
Harald Hoyer 650a10
index 2e78c49..dcb2aef 100755
Harald Hoyer 650a10
--- a/modules.d/45ifcfg/write-ifcfg.sh
Harald Hoyer 650a10
+++ b/modules.d/45ifcfg/write-ifcfg.sh
Harald Hoyer 650a10
@@ -9,6 +9,10 @@ if [ -e /tmp/bridge.info ]; then
Harald Hoyer 650a10
     . /tmp/bridge.info
Harald Hoyer 650a10
 fi
Harald Hoyer 650a10
 
Harald Hoyer 650a10
+if [ -e /tmp/vlan.info ]; then
Harald Hoyer 650a10
+    . /tmp/vlan.info
Harald Hoyer 650a10
+fi
Harald Hoyer 650a10
+
Harald Hoyer 650a10
 mkdir -m 0755 -p /tmp/ifcfg/
Harald Hoyer 650a10
 mkdir -m 0755 -p /tmp/ifcfg-leases/
Harald Hoyer 650a10
 
Harald Hoyer 650a10
@@ -103,6 +107,9 @@ for netup in /tmp/net.*.did-setup ; do
Harald Hoyer 650a10
     # $netif can't be bridge and bond at the same time
Harald Hoyer 650a10
         bond=yes
Harald Hoyer 650a10
     fi
Harald Hoyer 650a10
+    if [ "$netif" = "$vlanname" ]; then
Harald Hoyer 650a10
+        vlan=yes
Harald Hoyer 650a10
+    fi
Harald Hoyer 650a10
     cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
Harald Hoyer 650a10
     {
Harald Hoyer 650a10
         echo "# Generated by dracut initrd"
Harald Hoyer 650a10
@@ -149,7 +156,7 @@ for netup in /tmp/net.*.did-setup ; do
Harald Hoyer 650a10
     } > /tmp/ifcfg/ifcfg-$netif
Harald Hoyer 650a10
 
Harald Hoyer 650a10
     # bridge needs different things written to ifcfg
Harald Hoyer 650a10
-    if [ -z "$bridge" ] && [ -z "$bond" ]; then
Harald Hoyer 650a10
+    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
Harald Hoyer 650a10
         # standard interface
Harald Hoyer 650a10
         {
Harald Hoyer 650a10
             if [ -n "$macaddr" ]; then
Harald Hoyer 650a10
@@ -164,6 +171,15 @@ for netup in /tmp/net.*.did-setup ; do
Harald Hoyer 650a10
         } >> /tmp/ifcfg/ifcfg-$netif
Harald Hoyer 650a10
     fi
Harald Hoyer 650a10
 
Harald Hoyer 650a10
+    if [ -n "$vlan" ] ; then
Harald Hoyer 650a10
+        {
Harald Hoyer 650a10
+            echo "TYPE=Vlan"
Harald Hoyer 650a10
+            echo "NAME=\"$netif\""
Harald Hoyer 650a10
+            echo "VLAN=yes"
Harald Hoyer 650a10
+            echo "PHYSDEV=\"$phydevice\""
Harald Hoyer 650a10
+        } >> /tmp/ifcfg/ifcfg-$netif
Harald Hoyer 650a10
+    fi
Harald Hoyer 650a10
+
Harald Hoyer 650a10
     if [ -n "$bond" ] ; then
Harald Hoyer 650a10
         # bond interface
Harald Hoyer 650a10
         {