Mailinglist Archive: yast-commit (759 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Tue Mar 11 18:21:12 2008
New Revision: 45359

URL: http://svn.opensuse.org/viewcvs/yast?rev=45359&view=rev
Log:
show initiatorname tab as default during installation (bnc#368644)

Modified:
    trunk/iscsi-client/VERSION
    trunk/iscsi-client/package/yast2-iscsi-client.changes
    trunk/iscsi-client/src/IscsiClientLib.ycp
    trunk/iscsi-client/src/dialogs.ycp

Modified: trunk/iscsi-client/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=45359&r1=45358&r2=45359&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Tue Mar 11 18:21:12 2008
@@ -1 +1 @@
-2.16.6
+2.16.7

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=45359&r1=45358&r2=45359&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Mar 11 18:21:12 
2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Mar 10 18:20:19 CET 2008 - mzugec@xxxxxxx
+
+- show initiatorname tab as default during installation (bnc#368644)
+- 2.16.7 
+
+-------------------------------------------------------------------
 Mon Mar 10 12:06:17 CET 2008 - mzugec@xxxxxxx
 
 - fixed autoyast problem (bnc#367300)

Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=45359&r1=45358&r2=45359&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Tue Mar 11 18:21:12 2008
@@ -4,6 +4,7 @@
 
 import "Service";
 import "Popup";
+import "Hostname";
 
 global list <string> sessions = [];
 global list <string> discovered = [];
@@ -242,6 +243,20 @@
  return ret;
 }
 
+string getReverseDomainName(){
+list<string> host_fq = 
Hostname::SplitFQ(((map<string,any>)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;
+}
+
 // check initiatorname if exist, if no - create it
 global boolean checkInitiatorName(){
  boolean ret=true;
@@ -252,9 +267,10 @@
     y2milestone("%1 is empty or doesnt exists - replace with name stored in 
iBFT", file);
     initiatorname = name_from_bios;
    } else {
-       y2milestone("InitiatorNmae does not exist - generate it");
+       y2milestone("InitiatorName does not exist - generate it");
+        string domain = ((map<string,any>)SCR::Execute(.target.bash_output, 
""))["stdout"]:"com.example";
         map<string, any> output = (map<string, any>)SCR::Execute 
(.target.bash_output,
-                                                               
"/sbin/iscsi-iname -p iqn.`date +%Y-%m`.de.suse:01 | tr -d '\n'", $[]);
+               sformat("/sbin/iscsi-iname -p iqn.%1.%2:01 | tr -d '\n'","`date 
+%Y-%m`", getReverseDomainName()), $[]);
         if (size(output["stderr"]:"")==0){
          initiatorname=output["stdout"]:"";
        } else ret = false;

Modified: trunk/iscsi-client/src/dialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/dialogs.ycp?rev=45359&r1=45358&r2=45359&view=diff
==============================================================================
--- trunk/iscsi-client/src/dialogs.ycp (original)
+++ trunk/iscsi-client/src/dialogs.ycp Tue Mar 11 18:21:12 2008
@@ -289,7 +289,7 @@
             "tab_order": tab_order,
             "tabs": tabs_descr,
             "widget_descr": widgets,
-            "initial_tab" : (Stage::initial()) ? "client" : current_tab,
+            "initial_tab" : (Stage::initial()) ? "general" : current_tab,
             "tab_help" : _("<h1>iSCSI Initiator</h1>"),
         ]),
     ];

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx