Mailinglist Archive: yast-commit (477 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Thu Jun 25 15:43:58 2009
New Revision: 57739

URL: http://svn.opensuse.org/viewcvs/yast?rev=57739&view=rev
Log:
for lcs and ctc offer only 2 CHAN_IDS (bnc#515492)


Modified:
    branches/SuSE-SLE-10-SP3-Branch/network/VERSION
    branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes
    branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp
    branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp

Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/VERSION?rev=57739&r1=57738&r2=57739&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original)
+++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Thu Jun 25 15:43:58 2009
@@ -1 +1 @@
-2.13.131
+2.13.132

Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes?rev=57739&r1=57738&r2=57739&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Thu 
Jun 25 15:43:58 2009
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Jun 25 15:36:09 CEST 2009 - mzugec@xxxxxxx
+
+- for lcs and ctc offer only 2 CHAN_IDS (bnc#515492)
+- 2.13.132 
+
+-------------------------------------------------------------------
 Wed May 13 00:59:51 CEST 2009 - mzugec@xxxxxxx
 
 - default option miimon=100 for bonding (bnc#40449)

Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp?rev=57739&r1=57738&r2=57739&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/hardware.ycp Thu Jun 25 
15:43:58 2009
@@ -483,8 +483,8 @@
                     string devid0 = 
String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4);
                     string devid1 = 
String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4);
                     string devid2 = 
String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4);
-                   Lan::qeth_chanids = sformat("%1%2 %1%3 %1%4", devstr, 
devid0, devid1, devid2);
-Popup::Message(sformat("chanids %1", Lan::qeth_chanids));
+               if (Lan::DriverType(Lan::type)=="ctc" || 
Lan::DriverType(Lan::type)=="lcs") Lan::qeth_chanids = sformat("%1%2 %1%3", 
devstr, devid0, devid1);
+                       else Lan::qeth_chanids = sformat("%1%2 %1%3 %1%4", 
devstr, devid0, devid1, devid2);
        }
 
        y2milestone("type=%1",type);

Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp?rev=57739&r1=57738&r2=57739&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Thu Jun 25 
15:43:58 2009
@@ -737,8 +737,8 @@
                     string devid0 = 
String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4);
                     string devid1 = 
String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4);
                     string devid2 = 
String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4);
-                   Lan::qeth_chanids = sformat("%1%2 %1%3 %1%4", devstr, 
devid0, devid1, devid2);
-
+                if (DriverType(type)=="ctc" || DriverType(type)=="lcs") 
Lan::qeth_chanids = sformat("%1%2 %1%3", devstr, devid0, devid1);
+                        else Lan::qeth_chanids = sformat("%1%2 %1%3 %1%4", 
devstr, devid0, devid1, devid2);
           }
         }
     }

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