Author: mzugec
Date: Tue Jul 24 15:12:11 2007
New Revision: 39636
URL: http://svn.opensuse.org/viewcvs/yast?rev=39636&view=rev
Log:
fixed command line
fixed help for ipv6
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/cmdline.ycp
trunk/network/src/lan/help.ycp
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=39636&r1=39635&r2=39636&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Tue Jul 24 15:12:11 2007
@@ -1 +1 @@
-2.15.51
+2.15.52
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=39636&r1=39635&r2=39636&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Tue Jul 24 15:12:11 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 24 15:05:58 CEST 2007 - mzugec@suse.cz
+
+- fixed command line
+- fixed help for ipv6
+- 2.15.52
+
+-------------------------------------------------------------------
Mon Jul 23 22:48:24 CEST 2007 - mzugec@suse.de
- improved text in remote.desktop (#230145)
Modified: trunk/network/src/lan/cmdline.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=39636&r1=39635&r2=39636&view=diff
==============================================================================
--- trunk/network/src/lan/cmdline.ycp (original)
+++ trunk/network/src/lan/cmdline.ycp Tue Jul 24 15:12:11 2007
@@ -19,17 +19,20 @@
import "Report";
import "NetworkModules";
import "LanItems";
+import "Map";
list > getConfigList(){
list > confList = [];
- integer count = 0;
- list > overview = (list >)LanItems::Overview();
- foreach(map row, overview, {
- confList = add(confList, $[tostring(count) : $["id" : row["id"]:"",
- "rich_descr" : row["rich_descr"]:"",
- "descr" : row["table_descr", 0]:"",
- "addr" : row["table_descr", 1]:""]]);
- count = count + 1;
+ //integer count = 0;
+ LanItems::BuildLanOverview();
+ //list > overview = (list >)LanItems::Overview();
+ foreach(integer position,any row, LanItems::Items, {
+ LanItems::current = position;
+ confList = add(confList, $[tostring(size(confList )) : $["id" : position,
+ "rich_descr" : LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
+ "descr" : LanItems::getCurrentItem()["table_descr", "table_descr", 0]:"",
+ "addr" : LanItems::getCurrentItem()["table_descr", "table_descr", 1]:""]]);
+// count = count + 1;
});
return confList;
}
@@ -47,14 +50,13 @@
return true;
}
-string getDev(map options, list > config){
- string dev="";
+integer getItem(map options, list > config){
+ integer ret = -1;
foreach(map row, config, {
- foreach(string row_num, map dev_map, (map > )row, {
- if(options["id"]:"0"==row_num) dev = dev_map["id"]:"";
- });
+ if(options["id"]:"0" == Map::Keys(row)[0]:"") ret = tointeger(Map::Keys(row)[0]:"-1");
});
- return dev;
+ if(ret==-1)y2error("Device not matched!");
+ return ret;
}
@@ -141,22 +143,6 @@
}
- map settings = $[
- "STARTMODE": LanItems::startmode,
- "USERCONTROL": LanItems::usercontrol,
- // problems when renaming the interface?
- "FWZONE": "EXT",
- "MTU": LanItems::mtu,
- "BOOTPROTO": LanItems::bootproto,
- "IPADDR": LanItems::ipaddr,
- "NETMASK": LanItems::netmask,
- "REMOTEIP": LanItems::remoteip,
- "IFCFGTYPE": LanItems::type,
- "IFCFGID": LanItems::device,
- ];
-
-
-y2internal("%1", settings);
CommandLine::Print(LanItems::type);
CommandLine::Print(LanItems::bootproto);
CommandLine::Print(LanItems::ipaddr);
@@ -188,9 +174,19 @@
*/
define boolean EditHandler(map options) {
list > config = getConfigList();
+
if (validateId(options, config)==false) return false;
- string dev=getDev(options, config);
+ LanItems::current = getItem(options, config);
+ LanItems::SetItem();
+
+ if (!(size(LanItems::getCurrentItem()["ifcfg"]:"")>0)){
+ NetworkDevices::Add();
+ LanItems::operation = `edit;
+ LanItems::interfacename=LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
+ }
+
+/*
if (substring (dev, 0, 1) == "-") // unconfigured
{
integer i = tointeger (substring (dev, 1));
@@ -218,6 +214,7 @@
LanItems::startmode = "ifplugd";
}
}
+*/
LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
@@ -238,20 +235,6 @@
return false;
}
- map settings = $[
- "STARTMODE": LanItems::startmode,
- "USERCONTROL": LanItems::usercontrol,
- // problems when renaming the interface?
- "FWZONE": "EXT",
- "MTU": LanItems::mtu,
- "BOOTPROTO": LanItems::bootproto,
- "IPADDR": LanItems::ipaddr,
- "NETMASK": LanItems::netmask,
- "REMOTEIP": LanItems::remoteip,
- "IFCFGTYPE": LanItems::type,
- "IFCFGID": LanItems::device,
- ];
- CommandLine::Print(sformat("%1 : %2", _("Changing Configuration for"), dev));
CommandLine::Print(sformat("%1 :\t%2", _("Device Type"), LanItems::type));
CommandLine::Print(sformat("%1 :\t%2", _("Bootproto"), LanItems::bootproto));
CommandLine::Print(sformat("%1 :\t%2",_("IP Address"), LanItems::ipaddr));
Modified: trunk/network/src/lan/help.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=39636&r1=39635&r2=39636&view=diff
==============================================================================
--- trunk/network/src/lan/help.ycp (original)
+++ trunk/network/src/lan/help.ycp Tue Jul 24 15:12:11 2007
@@ -57,8 +57,8 @@
_("<p><b><big>IPv6 Protocol Settings</big></b></p>
<p>Check <b>Enable IPv6</b> to enable ipv6 module in the kernel.
It is possible to use IPv6 together with IPv4. This is default option.
-To disable IPv6, uncheck this option and disable autoload of the kernel
-module for ipv6. When ipv6 protocol is not used on your network, response
+To disable IPv6, uncheck this option (this will blacklist kernel
+module for ipv6). When ipv6 protocol is not used on your network, response
time can be faster.")
+
_("<p>All changes will be applied after reboot.</p>"),
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
