Mailinglist Archive: yast-commit (815 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Tue Aug 21 10:56:44 2007
New Revision: 40375

URL: http://svn.opensuse.org/viewcvs/yast?rev=40375&view=rev
Log:
correctly write wlan configuration (#297616)

Modified:
    trunk/network/VERSION
    trunk/network/package/yast2-network.changes
    trunk/network/src/lan/complex.ycp
    trunk/network/src/lan/hardware.ycp
    trunk/network/src/modules/LanItems.ycp

Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40375&r1=40374&r2=40375&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Tue Aug 21 10:56:44 2007
@@ -1 +1 @@
-2.15.64
+2.15.65

Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=40375&r1=40374&r2=40375&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Tue Aug 21 10:56:44 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Aug 21 10:53:41 CEST 2007 - mzugec@xxxxxxx
+
+- correctly write wlan configuration (#297616)
+- 2.15.65 
+
+-------------------------------------------------------------------
 Fri Aug 17 15:51:42 CEST 2007 - mzugec@xxxxxxx
 
 - use correct NAME for eth/wlan devices (#300670)

Modified: trunk/network/src/lan/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=40375&r1=40374&r2=40375&view=diff
==============================================================================
--- trunk/network/src/lan/complex.ycp (original)
+++ trunk/network/src/lan/complex.ycp Tue Aug 21 10:56:44 2007
@@ -132,13 +132,10 @@
        "rt73usb" : "",
        "prism54usb":""
     ];
-/*
- Unsupported:
-rt61, rt2500, z1211
-*/
     Lan::Add ();
 
     LanItems::SelectHWMap(LanItems::getCurrentItem()["hwinfo"]:$[]);
+    LanItems::Items[LanItems::current, "ifcfg"] = LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
     LanItems::operation = `edit;
 //    LanItems::SetDefaultsForHW ();
 
@@ -229,6 +226,13 @@
        else UI::ChangeWidget(`id(`delete), `Enabled, true);
    if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, false);
        else UI::ChangeWidget(`id(`edit), `Enabled, true);
+    if (!Mode::config() && Lan::HaveXenBridge ()) // #196479
+    {
+       // #178848
+       foreach (symbol b, [`add, `edit, `delete], {
+           UI::ChangeWidget (`id (b), `Enabled, false);
+       });
+    }
 /*
  if (hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, true);
        else UI::ChangeWidget(`id(`edit), `Enabled, false);
@@ -246,14 +250,8 @@
     });
     UI::ChangeWidget (`id (`_hw_items), `Items, term_items);
 
-    if (!Mode::config() && Lan::HaveXenBridge ()) // #196479
-    {
-       // #178848
-       foreach (symbol b, [`add, `edit, `delete], {
-           UI::ChangeWidget (`id (b), `Enabled, false);
-       });
-    }
  enableDisableButtons();
+ y2milestone("LanItems %1", LanItems::Items);
 }
 
 

Modified: trunk/network/src/lan/hardware.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=40375&r1=40374&r2=40375&view=diff
==============================================================================
--- trunk/network/src/lan/hardware.ycp (original)
+++ trunk/network/src/lan/hardware.ycp Tue Aug 21 10:56:44 2007
@@ -62,7 +62,7 @@
     }
 
 map<string, any> hardware = nil;
-map<string, any> udev = nil;
+//map<string, any> udev = nil;
 boolean hw_standalone=false;
 
 void initHardware(){

Modified: trunk/network/src/modules/LanItems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=40375&r1=40374&r2=40375&view=diff
==============================================================================
--- trunk/network/src/modules/LanItems.ycp (original)
+++ trunk/network/src/modules/LanItems.ycp Tue Aug 21 10:56:44 2007
@@ -176,7 +176,7 @@
 }
 
 global void AddNew(){
- current = size(Items)+1;
+ current = size(Items);
  operation = `add;
 }
 
@@ -212,12 +212,16 @@
 global void ReadNetworkInterfaces(){
     NetworkDevices::Read();
     NetworkDevices::CleanHotplugSymlink();
-    foreach(string tmpdevname, (list<string>)Map::Keys(NetworkDevices::FilterDevices("netcard")["eth"]:$[]), {
-     string confname = NetworkDevices::device_name("eth", tmpdevname);
 
-     integer pos = nil;
-     map<string, any> val = $[];
-     foreach(integer key, map<string, any> value, (map<integer, map<string, any> >)Items, {
+   // match configurations to Items list with hwinfo
+    map <string, any> configurations =  NetworkDevices::FilterDevices("netcard");
+    foreach(string devtype, ["eth", "wlan"], {
+     foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+      string confname = NetworkDevices::device_name(devtype, devnum);
+
+      integer pos = nil;
+      map<string, any> val = $[];
+      foreach(integer key, map<string, any> value, (map<integer, map<string, any> >)Items, {
        if (value["hwinfo", "dev_name"]:""==confname) {
                pos = key;
                val = value;
@@ -228,25 +232,30 @@
                Items[pos]=$[];
                }
        Items[pos, "ifcfg"] = confname;
+      });
     });
 
-  // add to items also virtual devices (configurations) without hwinfo
-  foreach(string dev_name, map tmp_map, NetworkDevices::FilterDevices("netcard"), {
-   foreach(string dev_num, (list<string>)Map::Keys(tmp_map), {
+  // add to Items also virtual devices (configurations) without hwinfo
+
+    foreach(string devtype, ["eth", "wlan"], {
+     foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), {
+
+//  foreach(string dev_name, map tmp_map, NetworkDevices::FilterDevices("netcard"), {
+//   foreach(string dev_num, (list<string>)Map::Keys(tmp_map), {
     boolean already = false;
     foreach(integer key, (list<integer>)Map::Keys(Items), {
-     if (NetworkDevices::device_name(dev_name, dev_num) == Items[key, "ifcfg"]:""){
+     if (NetworkDevices::device_name(devtype, devnum) == Items[key, "ifcfg"]:""){
       already = true;
       break;
      };
     });
     if (!already){
      AddNew();
-     Items[current] = $["ifcfg":NetworkDevices::device_name(dev_name, dev_num)];
+     Items[current] = $["ifcfg":NetworkDevices::device_name(devtype, devnum)];
     }
    });
   });
- y2milestone("LanItems::Items %1", Items);
+ y2milestone("Read Configuration LanItems::Items %1", Items);
 }
 
 list GetDescr(){

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