Mailinglist Archive: yast-commit (129 mails)

[mzugec@xxxxxxxxxxxxxxxxx]

Author: mzugec
Date: Thu Dec 23 01:14:36 2010
New Revision: 63028

URL: http://svn.opensuse.org/viewcvs/yast?rev=63028&view=rev
Log:
improved previous commit

Modified:
    branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp
    branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp
    branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp?rev=63028&r1=63027&r2=63028&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Thu Dec 23 
01:14:36 2010
@@ -134,7 +134,19 @@
         items = add (items, `item(`id(devname), sformat("%1 - %2", devname, 
configurations[devtype, devname, "NAME"]:""), 
settings["ETHERDEVICE"]:""==devname) );
      });
     });
-    UI::ChangeWidget(`id(key), `Items, items);
+    UI::ChangeWidget(`id(`vlan_eth), `Items, items);
+    UI::ChangeWidget(`id(`vlan_id), `Value, settings["VLAN_ID"]:0);
+}
+
+
+symbol HandleVLANSlave(string key, map event){
+  if (event["EventReason"]:""=="ValueChanged"){
+    string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), 
`Value), UI::QueryWidget(`id(`vlan_id), `Value));
+    NetworkInterfaces::Name = configname;
+    LanItems::Items[LanItems::current, "ifcfg"]= configname;
+    UI::ChangeWidget(`id("IFCFGID"), `Value, configname);
+  }
+ return nil;
 }
 
 /**
@@ -1126,9 +1138,7 @@
 
        if (LanItems::type == "vlan"){
         LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:"";
-y2internal("%1, %2", LanItems::vlan_id, (integer)settings["VLAN_ID"]:0);
         LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0);
-y2internal("%1", LanItems::vlan_id);
        } else if (LanItems::type == "br"){
          LanItems::bridge_ports = settings["BRIDGE_PORTS"]:"";
         } else if (contains(["tun", "tap"], LanItems::type)){

Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp?rev=63028&r1=63027&r2=63028&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp Thu Dec 23 
01:14:36 2010
@@ -538,6 +538,10 @@
                y2milestone("interface without hwinfo, proposing 
STARTMODE=auto");
                LanItems::startmode="auto";
     }
+   if (LanItems::type=="vlan"){
+         string vlanid=(string) UI::QueryWidget(`id(`num), `Value);
+        NetworkInterfaces::Current["VLAN_ID"] = vlanid;
+   }
 }
 
  string driver = (string) UI::QueryWidget(`modul, `Value);

Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp?rev=63028&r1=63027&r2=63028&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp Thu Dec 
23 01:14:36 2010
@@ -1111,7 +1111,7 @@
        newdev["NAME"] = description;
        // L3: bnc#585458
 //     if (!issubstring(Items[current, "ifcfg"]:"", type)) 
newdev["INTERFACETYPE"]=type;
-       if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) 
newdev["INTERFACETYPE"]=type;
+//     if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) 
newdev["INTERFACETYPE"]=type;
 
        if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes";
 

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