[PATCH] Generate correct ifcfg file for vlan= option.

[PATCH] Generate correct ifcfg file for vlan= option.

[Radek Vykydal]

---
 modules.d/45ifcfg/write-ifcfg.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
index 2e78c49..dcb2aef 100755
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ b/modules.d/45ifcfg/write-ifcfg.sh
@@ -9,6 +9,10 @@ if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
 fi
 
+if [ -e /tmp/vlan.info ]; then
+    . /tmp/vlan.info
+fi
+
 mkdir -m 0755 -p /tmp/ifcfg/
 mkdir -m 0755 -p /tmp/ifcfg-leases/
 
@@ -103,6 +107,9 @@ for netup in /tmp/net.*.did-setup ; do
     # $netif can't be bridge and bond at the same time
         bond=yes
     fi
+    if [ "$netif" = "$vlanname" ]; then
+        vlan=yes
+    fi
     cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
     {
         echo "# Generated by dracut initrd"
@@ -149,7 +156,7 @@ for netup in /tmp/net.*.did-setup ; do
     } > /tmp/ifcfg/ifcfg-$netif
 
     # bridge needs different things written to ifcfg
-    if [ -z "$bridge" ] && [ -z "$bond" ]; then
+    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
         # standard interface
         {
             if [ -n "$macaddr" ]; then
@@ -164,6 +171,15 @@ for netup in /tmp/net.*.did-setup ; do
         } >> /tmp/ifcfg/ifcfg-$netif
     fi
 
+    if [ -n "$vlan" ] ; then
+        {
+            echo "TYPE=Vlan"
+            echo "NAME=\"$netif\""
+            echo "VLAN=yes"
+            echo "PHYSDEV=\"$phydevice\""
+        } >> /tmp/ifcfg/ifcfg-$netif
+    fi
+
     if [ -n "$bond" ] ; then
         # bond interface
         {
-- 
1.7.11.7

Re: [PATCH] Generate correct ifcfg file for vlan= option.

[Harald Hoyer]

On 07/31/2013 03:18 PM, Radek Vykydal wrote:
> ---
>  modules.d/45ifcfg/write-ifcfg.sh | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
> index 2e78c49..dcb2aef 100755
> --- a/modules.d/45ifcfg/write-ifcfg.sh
> +++ b/modules.d/45ifcfg/write-ifcfg.sh
> @@ -9,6 +9,10 @@ if [ -e /tmp/bridge.info ]; then
>      . /tmp/bridge.info
>  fi
>  
> +if [ -e /tmp/vlan.info ]; then
> +    . /tmp/vlan.info
> +fi
> +
>  mkdir -m 0755 -p /tmp/ifcfg/
>  mkdir -m 0755 -p /tmp/ifcfg-leases/
>  
> @@ -103,6 +107,9 @@ for netup in /tmp/net.*.did-setup ; do
>      # $netif can't be bridge and bond at the same time
>          bond=yes
>      fi
> +    if [ "$netif" = "$vlanname" ]; then
> +        vlan=yes
> +    fi
>      cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
>      {
>          echo "# Generated by dracut initrd"
> @@ -149,7 +156,7 @@ for netup in /tmp/net.*.did-setup ; do
>      } > /tmp/ifcfg/ifcfg-$netif
>  
>      # bridge needs different things written to ifcfg
> -    if [ -z "$bridge" ] && [ -z "$bond" ]; then
> +    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ]; then
>          # standard interface
>          {
>              if [ -n "$macaddr" ]; then
> @@ -164,6 +171,15 @@ for netup in /tmp/net.*.did-setup ; do
>          } >> /tmp/ifcfg/ifcfg-$netif
>      fi
>  
> +    if [ -n "$vlan" ] ; then
> +        {
> +            echo "TYPE=Vlan"
> +            echo "NAME=\"$netif\""
> +            echo "VLAN=yes"
> +            echo "PHYSDEV=\"$phydevice\""
> +        } >> /tmp/ifcfg/ifcfg-$netif
> +    fi
> +
>      if [ -n "$bond" ] ; then
>          # bond interface
>          {
> 

thanks! pushed!