Author: mzugec
Date: Thu Jul 10 15:51:51 2008
New Revision: 48969
URL: http://svn.opensuse.org/viewcvs/yast?rev=48969&view=rev
Log:
when Log on, do startup automatic by default (bnc#400610)
Modified:
trunk/iscsi-client/VERSION
trunk/iscsi-client/package/yast2-iscsi-client.changes
trunk/iscsi-client/src/IscsiClientLib.ycp
trunk/iscsi-client/src/widgets.ycp
Modified: trunk/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=48969&r1=48968&r2=48969&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Thu Jul 10 15:51:51 2008
@@ -1 +1 @@
-2.17.0
+2.17.1
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=48969&r1=48968&r2=48969&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Jul 10 15:51:51 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 10 15:49:59 CEST 2008 - mzugec@suse.de
+
+- when Log on, do startup automatic by default (bnc#400610)
+- improved InitiatorName validator
+- 2.17.1
+
+-------------------------------------------------------------------
Thu Jul 10 13:33:46 CEST 2008 - mzugec@suse.de
- fixed text in Write dialog (bnc#393929)
Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=48969&r1=48968&r2=48969&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Jul 10 15:51:51 2008
@@ -7,6 +7,7 @@
import "Hostname";
import "Stage";
import "ModuleLoading";
+import "Mode";
global list <string> sessions = [];
global list <string> discovered = [];
@@ -251,14 +252,14 @@
}
string getReverseDomainName(){
-list<string> host_fq = Hostname::SplitFQ(((map)SCR::Execute(.target.bash_output, "hostname -f|tr -d '\n'"))["stdout"]:"");
-y2internal("hostfw%1", host_fq);
-string domain = "";
-
-foreach(string item, splitstring(host_fq[1]:"example.com", "."),{
- y2internal("item %1", item);
- domain = (size(domain)==0) ? item : sformat("%1.%2", item, domain);
-});
+ list<string> host_fq = Hostname::SplitFQ(((map)SCR::Execute(.target.bash_output, "hostname -f|tr -d '\n'"))["stdout"]:"");
+ y2internal("hostfw%1", host_fq);
+ string domain = "";
+
+ foreach(string item, splitstring(host_fq[1]:"example.com", "."),{
+ y2internal("item %1", item);
+ domain = (size(domain)==0) ? item : sformat("%1.%2", item, domain);
+ });
y2milestone("domain %1", domain);
return domain;
@@ -429,8 +430,17 @@
map output = (map)SCR::Execute(.target.bash_output,
sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:""));
-y2internal("output %1", output);
- return output["exit"]:-1==0;
+ y2internal("output %1", output);
+// if (output["exit"]:-1==0){
+ // set startup status to auto by default (bnc#400610)
+ if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic");
+ return true;
+/*
+ } else {
+ y2error("Error while Log-on into target : %1", output);
+ return false;
+ }
+*/
}
Modified: trunk/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=48969&r1=48968&r2=48969&view=diff
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Thu Jul 10 15:51:51 2008
@@ -252,18 +252,18 @@
*/
string i_name = (string)UI::QueryWidget(`initiator_name, `Value);
- // regexp for "iqn.yyyy-mm."
- string reg1 = "^iqn\.[[:digit:]]\{4\}\-[[:digit:]]\{2\}\.";
+ // regexp for "yyyy-mm."
+ string reg1 = "[[:digit:]]\{4\}\-[[:digit:]]\{2\}\.";
// regexp for "cz.suse" or just "suse", "cz.su-se"
- string reg2 = "([[:alnum:]][[:alnum:]-]+\.){0,1}[[:alnum:]][[:alnum:]-]{1,}";
- // regexp for [:identifier]
- string reg3 = "[:[:alnum:]*.{,1}]*";
+ string reg2 = "[[:alnum:]\.\:-]*";
- boolean correct = regexpmatch(i_name, sformat("%1%2%3", reg1, reg2, reg3));
+ boolean correct = regexpmatch(i_name, sformat("^iqn\.%1%2$", reg1, reg2)) ||
+ regexpmatch(i_name, sformat("^eui\.%1%2$", reg1, reg2));
if (!correct) Popup::Warning(_("Incorrect InitiatorName.
The correct syntax is
-iqn.yyyy-mm.reversed domain name[:identifier]
+iqn.yyyy-mm.reversed.domain.name[:identifier]
+or eui.yyyy-mm.reversed.domain.name[:identifier]
Example:
iqn.2007-04.cz.server:storage.disk.sdb
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
