Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Sep 13, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5db8f5b
Fix wrong interface name with auto_vlan=yes (bsc#1043419)
pzirnik Aug 10, 2017
3da3b18
version + changelog
mvidner Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
@@ -1 +1 @@
2.17.28
2.17.29
6 changes: 6 additions & 0 deletions package/yast2-fcoe-client.changes
View file
Open in desktop
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/FcoeClient.ycp
View file
Open in desktop
Expand Up @@ -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 );
Expand Down
9 changes: 8 additions & 1 deletion src/complex.ycp
View file
Open in desktop
Expand Up @@ -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>)
Expand Down