Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65123 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: FcoeClient.ycp inst_fcoe-client.ycp
Author: gs
Date: Tue Aug 2 13:16:04 2011
New Revision: 65123

URL: http://svn.opensuse.org/viewcvs/yast?rev=65123&view=rev
Log:
remove the check for running network services, it
doesn't make sense, the interfaces are set up
during the FCoE configuration

Modified:
branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.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=65123&r1=65122&r2=65123&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 Tue Aug 2
13:16:04 2011
@@ -288,19 +288,18 @@
string vlan_interface = "";
map output = $[];

- if ( Stage::initial() )
+
+ // call 'ifconfig <interface> up' here because it's not yet clear who
configures
+ // the interfaces (fipvlan command itself?) -> see bnc #705171
+ // (this applies also to installed system)
+ string cmd_ifup = sformat( "ifconfig %1 up", interface );
+ y2milestone( "Executing command: %1", cmd_ifup );
+ output = (map)SCR::Execute( .target.bash_output, cmd_ifup );
+ y2milestone( "Output: %1", output );
+ if ( output["exit"]:255 != 0 )
{
- // call 'ifconfig <interface> up' in first stage of installation
because it's not yet
- // clear who configures the interfaces here, (fipvlan command itself?)
-> see bnc #705171
- string cmd_ifup = sformat( "ifconfig %1 up", interface );
- y2milestone( "Executing command: %1", cmd_ifup );
- output = (map)SCR::Execute( .target.bash_output, cmd_ifup );
- y2milestone( "Output: %1", output );
- if ( output["exit"]:255 != 0 )
- {
- Popup::Error( sformat( _("Interface %1 not up"), interface ) );
- y2error( "Interface %1 not up", interface );
- }
+ Popup::Error( sformat( _("Interface %1 not up"), interface ) );
+ y2error( "Interface %1 not up", interface );
}

// check whether there is a VLAN interface which is configured for FCoE
@@ -790,8 +789,8 @@
""
);

- // check if network services are running
- if(!NetworkService::RunningNetworkPopup()) return false;
+ // a check for running network services doesn't make sense (is not
needed), the
+ // interfaces are set up in FcoeClient::GetVlanInterfaces()

if(PollAbort()) return false;
Progress::NextStage();

Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp?rev=65123&r1=65122&r2=65123&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
(original)
+++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Tue
Aug 2 13:16:04 2011
@@ -41,23 +41,16 @@
// create /etc/fcoe
SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" );

-// TODO: check what is additional needed
-// - load any modules ?
-//
-// FcoeClient::CheckInstalledPackages() not needed in inst-sys
-// FcoeClient::DetectStartStatus() doesn't make sense in inst-sys
-
-// check for running network
-if( !NetworkService::RunningNetworkPopup() )
-{
- y2error( "Network NOT set up" );
- return nil;
-}
+// FcoeClient::CheckInstalledPackages() not needed in inst-sys
+// FcoeClient::DetectStartStatus() doesn't make sense in inst-sys
+// NetworkService::RunningNetworkPopup() do not check for running network, the
+// interfaces are set up in FcoeClient::GetVlanInterface()

// reset global values
FcoeClient::ResetNetworkCards();

// start services fcoe and lldpad
+// (modules for fcoe are loaded in /etc/init.d/fcoe)
success = FcoeClient::ServiceStatus();
if ( !success )
{

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages