Author: mzugec
Date: Tue Feb 9 13:20:20 2010
New Revision: 60759
URL: http://svn.opensuse.org/viewcvs/yast?rev=60759&view=rev
Log:
wait when start iscsid (bnc#570678)
Modified:
trunk/iscsi-client/VERSION
trunk/iscsi-client/package/yast2-iscsi-client.changes
trunk/iscsi-client/src/IscsiClientLib.ycp
trunk/iscsi-client/src/inst_iscsi-client.ycp
trunk/iscsi-client/src/widgets.ycp
Modified: trunk/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=60759&r1=60758&r2=60759&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Tue Feb 9 13:20:20 2010
@@ -1 +1 @@
-2.18.9
+2.19.0
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=60759&r1=60758&r2=60759&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Feb 9 13:20:20 2010
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 9 13:19:16 CET 2010 - mzugec@suse.cz
+
+- wait when start iscsid (bnc#570678)
+- 2.19.0
+
------------------------------------------------------------------
Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=60759&r1=60758&r2=60759&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Tue Feb 9 13:20:20 2010
@@ -230,6 +230,19 @@
}
+global void startIScsid(){
+ SCR::Execute(.background.run_output_err, "pgrep iscsid || iscsid");
+ foreach(integer i,[0,1,2,3,4,5,6,7,8,9],{
+ sleep(1*1000);
+ map cmd=(map)SCR::Execute(.target.bash_output, "iscsiadm -m session");
+ y2internal("iteration %1, retcode %2",i, cmd["exit"]:-1);
+ if (cmd["exit"]:-1==0){
+ y2internal("Good response from daemon, exit.");
+ break;
+ }
+ });
+}
+
// get all connected targets
global boolean readSessions(){
y2milestone("reading current settings");
@@ -479,7 +492,7 @@
if (Stage::initial()){
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
// start daemon before
- SCR::Execute(.background.run_output_err, "pgrep iscsid || iscsid");
+ startIScsid();
} else {
if (Service::Status("open-iscsi") == 0) serviceStatus=true;
@@ -515,7 +528,7 @@
SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]);
} else checkInitiatorName();
// start daemon before
- SCR::Execute(.background.run_output_err, "iscsid");
+ startIScsid();
}
global boolean autoyastWrite(){
@@ -535,4 +548,6 @@
});
return true;
}
+
+
}
Modified: trunk/iscsi-client/src/inst_iscsi-client.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/inst_iscsi-client.ycp?rev=60759&r1=60758&r2=60759&view=diff
==============================================================================
--- trunk/iscsi-client/src/inst_iscsi-client.ycp (original)
+++ trunk/iscsi-client/src/inst_iscsi-client.ycp Tue Feb 9 13:20:20 2010
@@ -42,7 +42,7 @@
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
// start daemon before
-SCR::Execute(.background.run_output_err, "iscsid");
+IscsiClientLib::startIScsid();
//if (size(IscsiClientLib::getiBFT())>0) IscsiClientLib::autoLogOn();
IscsiClientLib::getiBFT();
Modified: trunk/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=60759&r1=60758&r2=60759&view=diff
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Tue Feb 9 13:20:20 2010
@@ -290,7 +290,7 @@
IscsiClientLib::writeInitiatorName((string)UI::QueryWidget(`initiator_name, `Value));
if (Stage::initial()){
SCR::Execute(.target.bash, "killproc /sbin/iscsid");
- SCR::Execute(.background.run_output_err, "iscsid");
+ IscsiClientLib::startIScsid();
}
else SCR::Execute(.target.bash, "rcopen-iscsi restart");
y2milestone("write initiatorname %1", IscsiClientLib::initiatorname);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
