Merge pull request #38 from yast/vlan-11

Fix wrong interface name with auto_vlan=yes (bsc#1043419)

VERSION

@@ -1 +1 @@
-2.17.28
+2.17.29

package/yast2-fcoe-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 10 14:12:31 UTC 2017 - mvidner@suse.com
+
+- Fix wrong interface name with auto_vlan=yes (bsc#1043419)
+- 2.17.29
+
 -------------------------------------------------------------------
 Thu Oct  6 14:27:50 UTC 2016 - igonzalezsosa@suse.com
 

src/FcoeClient.ycp

@@ -882,6 +882,7 @@ global boolean WriteSysconfigFiles( )
                     SCR::Write(.network.value + card["fcoe_vlan"]:"" + "STARTMODE", "nfsroot" );
                     SCR::Write(.network.value + card["fcoe_vlan"]:"" + "ETHERDEVICE", card["dev_name"]:"" );
                     SCR::Write(.network.value + card["fcoe_vlan"]:"" + "USERCONTROL", "no" );
+                    SCR::Write(.network.value + card["fcoe_vlan"]:"" + "VLAN_ID", card["vlan_interface"]:"" );
                 }
 		string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", card["dev_name"]:"" );
 		y2milestone( "Writing %1", ifcfg_file );

src/complex.ycp

@@ -332,7 +332,14 @@ on %1 and start the FCoE initiator?"), dev_name ) );
 	    else	// installed system - if VLAN already exists only start FCoE
 	    {
 		// create and start FCoE
-		command = sformat( "fipvlan -c -s --link-retry 60 %1", dev_name );
+		if ( card["auto_vlan"]:"no" == "yes" || card["vlan_interface"]:"" == "0" )
+		{
+		    command = sformat( "fipvlan -c -s -f '-fcoe' --link-retry 60 %1", dev_name );
+		}
+		else
+		{
+		    command = sformat( "fipvlan -c -s --link-retry 60 %1", dev_name );
+		}
 
                 // if /etc/sysconfig/network/ifcfg-<if>.<vlan> already exists
 		// call 'ifup' for the interface (creates /proc/net/vlan/<if>.<vlan>)