From: Harald Hoyer <harald@redhat.com>
Date: Wed, 11 Sep 2013 07:56:57 +0000 (+0200)
Subject: network: correctly name iBFT vlan devices
X-Git-Tag: 033~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0aa98a1dfd9efda28ce0d373354228e6b7b4447;p=thirdparty%2Fdracut.git

network: correctly name iBFT vlan devices
---

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 5b629172a..88e72ece9 100644
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -244,7 +244,16 @@ ibft_to_cmdline() {
 
             if [ -e ${iface}/vlan ]; then
                vlan=$(read a < ${iface}/vlan; echo $a)
-               [ "$vlan" -ne "0" ] && echo "vlan=$vlan:$dev"
+               if [ "$vlan" -ne "0" ]; then
+                   case "$vlan" in
+                       [0-9]*)
+                           echo "vlan=$dev.$vlan:$dev"
+                           ;;
+                       *)
+                           echo "vlan=$vlan:$dev"
+                           ;;
+                   esac
+               fi
             fi
 
             echo $mac > /tmp/net.${dev}.has_ibft_config