Author: mzugec
Date: Tue Mar 23 09:57:32 2010
New Revision: 61441
URL: http://svn.opensuse.org/viewcvs/yast?rev=61441&view=rev
Log:
read iBFT before start daemon (bnc#573864)
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
Modified: trunk/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=61441&r1=61440&r2=61441&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Tue Mar 23 09:57:32 2010
@@ -1 +1 @@
-2.19.2
+2.19.3
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=61441&r1=61440&r2=61441&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Mar 23 09:57:32 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Mar 23 09:57:19 CET 2010 - mzugec@suse.cz
+
+- read iBFT before start daemon (bnc#573864)
+- 2.19.3
+
+-------------------------------------------------------------------
Thu Mar 11 12:57:53 CET 2010 - mzugec@suse.cz
- helptext typo (bnc#585387)
Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=61441&r1=61440&r2=61441&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Tue Mar 23 09:57:32 2010
@@ -414,41 +414,14 @@
return ret;
}
-/*
global boolean autoLogOn(){
y2milestone("begin of autoLogOn function");
- map b = getiBFT();
-y2milestone("data read from iBFT card %1", b);
- if ( b != $[] ){
- y2milestone("checking size of %1 and %2", b["node.name"]:"", b["node.conn[0].address"]:"");
- if (size(b["node.name"]:"")>0 && size(b["node.conn[0].address"]:"")>0){
- list <string> curr_rec = [sformat("%1:%2", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260"), b["node.name"]:""];
- y2milestone("variable curr_rec %1", curr_rec);
- if (connected( curr_rec , false) == false){
- y2milestone("in case not connected do discovery");
- // do discovery
- SCR::Execute(.target.bash, sformat("iscsiadm -m discovery -t st -p %1:%2", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260"));
-
- // do authentication if needed TODO: use NEW(iscsiadm -m fw) options
- if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){
- y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
- setValue(curr_rec, "node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:"");
- setValue(curr_rec, "node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
- setValue(curr_rec, "node.session.auth.authmethod", "CHAP");
- } else y2internal("No authentication used for autoLogOn");
-
- // log on into target
- SCR::Execute(.target.bash, sformat("iscsiadm -m node -T %1 -p %2:%3 --login ", b["node.name"]:"", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260"));
-
- // set startup status to onboot
- y2milestone("set startup status to onboot");
- setStartupStatus(curr_rec, "onboot");
- } else y2error("Already connected, no autoLogOn needed");
- } else y2error("node.name or node.conn[0].address are not available. Couldn't do autoLogOn");
+ if (size(getiBFT())>0){
+ y2milestone("Autologin into iBFT : %1", SCR::Execute(.target.bash_output, "iscsiadm -m fw -l"));
}
return true;
}
-*/
+
global boolean loginIntoTarget(map target){
currentRecord = [target["portal"]:"", target["target"]:""];
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=61441&r1=61440&r2=61441&view=diff
==============================================================================
--- trunk/iscsi-client/src/inst_iscsi-client.ycp (original)
+++ trunk/iscsi-client/src/inst_iscsi-client.ycp Tue Mar 23 09:57:32 2010
@@ -40,12 +40,12 @@
IscsiClientLib::checkInitiatorName();
+IscsiClientLib::getiBFT();
ModuleLoading::Load("iscsi_tcp", "", "", "", false, true);
-// start daemon before
+// start iscsid daemon
IscsiClientLib::startIScsid();
-//if (size(IscsiClientLib::getiBFT())>0) IscsiClientLib::autoLogOn();
-IscsiClientLib::getiBFT();
+IscsiClientLib::autoLogOn();
// run dialog
ret = MainSequence();
y2debug("MainSequence ret=%1", ret);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
