Author: mzugec Date: Wed May 21 16:54:35 2008 New Revision: 47770 URL: http://svn.opensuse.org/viewcvs/yast?rev=47770&view=rev Log: don't install open-iscsi when run by storage (bnc#392976) start iscsid also when run by storage (bnc#392981) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=47770&r1=47769&r2=47770&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed May 21 16:54:35 2008 @@ -1 +1 @@ -2.16.10 +2.16.11 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=47770&r1=47769&r2=47770&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed May 21 16:54:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 21 16:46:21 CEST 2008 - mzugec@suse.cz + +- don't install open-iscsi when run by storage (bnc#392976) +- start iscsid also when run by storage (bnc#392981) +- 2.16.11 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=47770&r1=47769&r2=47770&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Wed May 21 16:54:35 2008 @@ -83,7 +83,7 @@ boolean installed_packages(){ // don't check interactively for packages (bnc#367300) // skip it during second stage or when create AY profile - if(Stage::cont() || Mode::config()) return true; + if(Stage::cont() || Stage::initial() || Mode::config()) return true; y2milestone("Check if open-iscsi package installed"); boolean ret = false; if( !Package::InstallMsg( "open-iscsi", Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=47770&r1=47769&r2=47770&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Wed May 21 16:54:35 2008 @@ -5,6 +5,8 @@ import "Service"; import "Popup"; import "Hostname"; +import "Stage"; +import "ModuleLoading"; global list <string> sessions = []; global list <string> discovered = []; @@ -430,10 +432,17 @@ // get status of open-iscsi global boolean getServiceStatus(){ boolean ret = true; - if (Service::Status("open-iscsi") == 0) serviceStatus=true; - y2milestone("Service status = %1", serviceStatus); - // if not enabled, start it manually - if (!serviceStatus) Service::Start("open-iscsi"); + if (Stage::initial()){ + ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + // start daemon before + SCR::Execute(.background.run_output_err, "pgrep iscsid || iscsid"); + + } else { + if (Service::Status("open-iscsi") == 0) serviceStatus=true; + y2milestone("Service status = %1", serviceStatus); + // if not enabled, start it manually + if (!serviceStatus) Service::Start("open-iscsi"); + } return ret; } @@ -449,6 +458,7 @@ Service::Stop("open-iscsi"); } } + if (Stage::initial()) Service::Enable("open-iscsi"); y2milestone("Status service for open-iscsi: %1", ret); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org