Author: gs Date: Wed Jan 11 14:25:43 2012 New Revision: 67145 URL: http://svn.opensuse.org/viewcvs/yast?rev=67145&view=rev Log: add option -u to fipvlan (let interfaces up), workaround for service start in installed system Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp?rev=67145&r1=67144&r2=67145&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Wed Jan 11 14:25:43 2012 @@ -288,7 +288,9 @@ // global map GetVlanInterfaces( list net_devices ) { - string vlan_cmd = "LANG=POSIX fipvlan"; + // Add option -u (or --link_up): don't shut down interfaces + // to be able to detect DCB state afterwards (see bnc #737683) + string vlan_cmd = "LANG=POSIX fipvlan -u"; map vlan_info = $[]; foreach ( string dev, (list<string>)net_devices, { @@ -583,6 +585,8 @@ // global boolean ServiceStatus() { + boolean success = true; + // Loading of modules in Stage::initial() is not required (like in IsciClientLib.ycp, line 523 ) // see /etc/init.d/fcoe, line 85 (modprobe fcoe > /dev/null 2>&1) boolean ret = true; @@ -590,7 +594,7 @@ // first start lldpad if ( Service::Status( "boot.lldpad" ) != 0 ) { - boolean success = Service::Start( "boot.lldpad" ); + success = Service::Start( "boot.lldpad" ); if ( success ) { y2milestone( "Lldpad started (/etc/init.d/boot.lldpad start)"); @@ -609,9 +613,14 @@ y2milestone( "Lldpad service is running"); } - if ( Service::Status( "boot.fcoe" ) != 0 ) + if ( Service::Status( "boot.fcoe" ) != 0 ) { - boolean success = Service::Start( "boot.fcoe" ); + // workaround for installed system (see bnc #737798) + if ( Stage::normal() ) + success = Service::Restart( "boot.fcoe" ); + else + success = Service::Start( "boot.fcoe" ); + if ( success ) { y2milestone( "FCoE started (/etc/init.d/boot.fcoe start)"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org