[yast-commit] r62129 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp

Author: mzugec Date: Mon Jun 21 15:37:16 2010 New Revision: 62129 URL: http://svn.opensuse.org/viewcvs/yast?rev=62129&view=rev Log: L3: iBFT installation with CHAP (bnc#485656) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION?rev=62129&r1=62128&r2=62129&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION Mon Jun 21 15:37:16 2010 @@ -1 +1 @@ -2.14.47 +2.14.48 Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=62129&r1=62128&r2=62129&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes Mon Jun 21 15:37:16 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 21 15:35:31 CEST 2010 - mzugec@suse.cz + +- L3: iBFT installation with CHAP (bnc#485656) +- 2.14.48 + +------------------------------------------------------------------- Fri May 29 11:20:37 CEST 2009 - ug@suse.de - rnc file added (bnc#492303) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp?rev=62129&r1=62128&r2=62129&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp Mon Jun 21 15:37:16 2010 @@ -51,7 +51,7 @@ global map getiBFT(){ if (ibft==nil){ ibft=$[]; - string from_bios = ((map)SCR::Execute(.target.bash_output, "fwparam_ibft -b"))["stdout"]:""; + string from_bios = ((map)SCR::Execute(.target.bash_output, "iscsiadm -m fw"))["stdout"]:""; foreach(string row, splitstring(from_bios, "\n"), { list<string> key_val=splitstring(row, "="); if (size(key_val[0]:"")>0) ibft[key_val[0]:""] = key_val[1]:""; @@ -297,7 +297,7 @@ boolean ret=true; // string initiatorname=""; string file="/etc/iscsi/initiatorname.iscsi"; - string name_from_bios = getiBFT()["iSCSI_INITIATOR_NAME"]:""; + string name_from_bios = getiBFT()["iface.initiatorname"]:""; y2milestone("Check %1", file); if (size((map)SCR::Read (.target.lstat, file)) == 0 || ((map)SCR::Read (.target.lstat, file))["size"]:0==0){ @@ -416,6 +416,7 @@ map b = getiBFT(); y2milestone("data read from iBFT card %1", b); if ( b != $[] ){ +/* y2milestone("checking size of %1 and %2", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:""); if (size(b["iSCSI_TARGET_NAME"]:"")>0 && size(b["iSCSI_TARGET_IPADDR"]:"")>0){ currentRecord = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""]; @@ -447,6 +448,8 @@ setStartupStatus("automatic"); } else y2error("Already connected, no autoLogOn needed"); } else y2error("iSCSI_TARGET_NAME or iSCSI_TARGET_IPADDR are not available. Couldn't do autoLogOn"); +*/ + y2milestone("autologin: %1", SCR::Execute(.target.bash_output, "iscsiadm -m fw -l")); } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org