Author: fehr Date: Thu Feb 2 16:06:17 2012 New Revision: 67355 URL: http://svn.opensuse.org/viewcvs/yast?rev=67355&view=rev Log: call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=67355&r1=67354&r2=67355&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 16:06:17 2012 @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Jan 30 19:14:16 CET 2012 - fehr@suse.de +Thu Feb 2 16:03:22 CET 2012 - fehr@suse.de + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - fehr@suse.de - create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp?rev=67355&r1=67354&r2=67355&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 16:06:17 2012 @@ -381,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. @@ -661,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org