Author: gs Date: Wed Nov 23 13:56:11 2011 New Revision: 66904 URL: http://svn.opensuse.org/viewcvs/yast?rev=66904&view=rev Log: set correct defaults after remove Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp?rev=66904&r1=66903&r2=66904&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Nov 23 13:56:11 2011 @@ -395,15 +395,15 @@ if ( !Stage::initial() ) { // popup text continues - popup_text = popup_text + "\n" + _( "Attention: + popup_text = popup_text + "\n" + _("Attention: Make sure the interface is not essential for a used device. -Removing it may result in an unusable system." ); +Removing it may result in an unusable system."); } else { // popup text continues - popup_text = popup_text + "\n" + _( "Don't remove the interface if it's related -to an already activated multipath device." ); + popup_text = popup_text + "\n" + _("Don't remove the interface if it's related +to an already activated multipath device."); } boolean ret = Popup::AnyQuestion( Label::WarningMsg(), @@ -443,8 +443,9 @@ // set new values in global map network_interfaces card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; card["fcoe_enable"] = "yes"; - card["dcb_required"] = (card["dcb_capable"]:""=="yes")?"yes":"no"; - card["auto_vlan"] = "no"; + // exception for Broadcom cards: DCB_REQUIRED should be set to "no" (bnc #728658) + card["dcb_required"] = ((card["driver"]:"" != "bnx2x") && (card["dcb_capable"]:""=="yes"))?"yes":"no"; + card["auto_vlan"] = "yes"; // default is "yes" (bnc #724563) card["cfg_file"] = ""; FcoeClient::SetModified( true ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org