Author: mzugec Date: Wed Jun 18 12:17:20 2008 New Revision: 48381 URL: http://svn.opensuse.org/viewcvs/yast?rev=48381&view=rev Log: initial support for IPv6 prefix parameter in CLI support for "/24" syntax as prefixlen Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan.ycp trunk/network/src/lan/address.ycp trunk/network/src/lan/cmdline.ycp trunk/network/src/modules/LanItems.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Jun 18 12:17:20 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Jun 18 12:17:20 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jun 18 12:16:54 CEST 2008 - mzugec@suse.de + +- initial support for IPv6 +- prefix parameter in CLI +- support for "/24" syntax as prefixlen +- 2.17.1 + +------------------------------------------------------------------- Fri Jun 13 17:07:11 CEST 2008 - mzugec@suse.cz - network installation broken (bnc#399645) Modified: trunk/network/src/clients/lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan.ycp?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/src/clients/lan.ycp (original) +++ trunk/network/src/clients/lan.ycp Wed Jun 18 12:17:20 2008 @@ -122,12 +122,17 @@ "help": _("Network mask"), "type": "netmask" ], + "prefix" : $[ + /* Commandline option help */ + "help": _("Prefix lenght"), + "type": "string" + ], ], "mappings" : $[ "list" : [ "configured", "unconfigured" ], "show" : [ "id" ], - "add" : [ "type", "bootproto", "ip", "netmask" ], - "edit" : [ "id", "type", "bootproto", "ip", "netmask" ], + "add" : [ "type", "bootproto", "ip", "netmask", "prefix" ], + "edit" : [ "id", "type", "bootproto", "ip", "netmask", "prefix" ], "delete": [ "id" ], ] ]; Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Wed Jun 18 12:17:20 2008 @@ -112,7 +112,7 @@ void StoreBridge(string key, map event) { settings["BRIDGE_PORTS"] = mergestring((list<string>)UI::QueryWidget (`id("BRIDGE_PORTS"), `SelectedItems), " "); -y2internal("store bridge %1 : %2", key, settings["BRIDGE_PORTS"]:""); +y2milestone("store bridge %1 : %2", key, settings["BRIDGE_PORTS"]:""); } @@ -195,7 +195,9 @@ switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); - UI::ChangeWidget(`id(`netmask), `Value, settings["NETMASK"]:""); + if (size(settings["PREFIXLEN"]:"")>0) + UI::ChangeWidget(`id(`netmask), `Value, sformat("/%1", settings["PREFIXLEN"]:"")); + else UI::ChangeWidget(`id(`netmask), `Value, settings["NETMASK"]:""); UI::ChangeWidget(`id(`hostname), `Value, settings["HOSTNAME"]:""); break; case "dhcp" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `dynamic); @@ -234,10 +236,13 @@ case `none : settings["BOOTPROTO"]="none"; settings["IPADDR"] = ""; settings["NETMASK"] = ""; + settings["PREFIXLEN"] = ""; break; case `static: settings["BOOTPROTO"]="static"; settings["IPADDR"]=(string)UI::QueryWidget(`ipaddr, `Value); - settings["NETMASK"]=(string)UI::QueryWidget(`netmask, `Value); + string mask = (string)UI::QueryWidget(`netmask, `Value); + if(substring(mask, 0,1)=="/") settings["PREFIXLEN"]=substring(mask, 1); + else settings["NETMASK"]=mask; settings["HOSTNAME"]=(string)UI::QueryWidget(`hostname, `Value); break; default : switch ((symbol)UI::QueryWidget(`dyn, `Value)){ @@ -393,11 +398,20 @@ UI::SetFocus(`ipaddr); return false; } - if (!Netmask::Check4((string) UI::QueryWidget (`netmask, `Value))){ - Popup::Error(_("No valid netmask.")); - UI::SetFocus(`netmask); - return false; + + string mask=(string) UI::QueryWidget (`netmask, `Value); + boolean valid_mask=false; + if (Netmask::Check4(mask)) valid_mask=true; + else if (regexpmatch(mask, "^/[[:digit:]]{1,2}$")) valid_mask=true; + else if (Netmask::Check6(mask)) valid_mask=true; + else if (regexpmatch(mask, "^/[[:digit:]]{1,3}$")) valid_mask=true; + + if(!valid_mask){ + Popup::Error(_("No valid netmask or prefix lenght.")); + UI::SetFocus(`netmask); + return false; } + string h = (string) UI::QueryWidget(`hostname, `Value ); if ( h != "" && !Hostname::CheckFQ(h)) { Popup::Error(_("No valid hostname.")); @@ -686,6 +700,7 @@ "BOOTPROTO": LanItems::bootproto, "IPADDR": LanItems::ipaddr, "NETMASK": LanItems::netmask, + "PREFIXLEN": LanItems::prefix, "REMOTEIP": LanItems::remoteip, "HOSTNAME": hostname_initial, Modified: trunk/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/src/lan/cmdline.ycp (original) +++ trunk/network/src/lan/cmdline.ycp Wed Jun 18 12:17:20 2008 @@ -28,9 +28,9 @@ 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]:""]]); + "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; @@ -104,7 +104,6 @@ // create plain text from formated HTML string text = sformat("echo \"%1\"|sed s/'<br>'/'\\n'/g|sed s/'<\\/li>'/'\\n'/g|sed s/'<[/a-z]*>'/''/g", value["rich_descr"]:""); map descr = (map)SCR::Execute(.target.bash_output, text); - y2internal("%1", descr); CommandLine::Print( descr["stdout"]:"" ); } }); @@ -217,7 +216,7 @@ } } */ -if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static"; + if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static"; LanItems::bootproto = options["bootproto"]:"none"; if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){ @@ -226,7 +225,8 @@ } if (LanItems::bootproto=="static"){ LanItems::ipaddr = options["ip"]:""; - LanItems::netmask = options["netmask"]:"255.255.255.0"; + if (size(options["prefix"]:"")>0) LanItems::prefix = options["prefix"]:""; + else LanItems::netmask = options["netmask"]:"255.255.255.0"; } else{ LanItems::ipaddr = ""; LanItems::netmask = ""; @@ -237,13 +237,14 @@ Report::Error(_("Impossible value for startmode!")); return false; } - +/* 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)); CommandLine::Print(sformat("%1 :\t%2",_("Mask"), LanItems::netmask)); +*/ LanItems::Commit(); - + ShowHandler(options); return true; } /** Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Wed Jun 18 12:17:20 2008 @@ -58,6 +58,7 @@ global string ipaddr = ""; global string remoteip = ""; global string netmask = ""; +global string prefix = ""; global string startmode = "auto"; global boolean usercontrol = false; @@ -245,7 +246,6 @@ } } }); -y2internal("udev net_rules %1", net_rules); SCR::Write(.udev_persistent.rules, net_rules); SCR::Write(.udev_persistent.nil, []); foreach(string dev, changed_devices, { @@ -453,11 +453,13 @@ { if (ip != "NONE") { - bullets = bullets + [ - ip == "DHCP" ? _("IP address assigned using DHCP") : - sformat(_("IP address: %1, subnet mask %2") - , ip, NetworkInterfaces::Current["NETMASK"]:""), - ]; + string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:""; + string descr = _("IP address assigned using DHCP"); + if (ip != "DHCP") descr=(size(prefixlen)>0) ? + sformat(_("IP address: %1/%2"), ip, prefixlen) : + sformat(_("IP address: %1, subnet mask %2") + , ip, NetworkInterfaces::Current["NETMASK"]:""); + bullets = bullets + [ descr ]; } // build aliases overview if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ @@ -742,13 +744,13 @@ /* address options */ bootproto = GetDeviceVar (devmap, defaults, "BOOTPROTO"); ipaddr = GetDeviceVar (devmap, defaults, "IPADDR"); + prefix = GetDeviceVar (devmap, defaults, "PREFIXLEN"); remoteip = GetDeviceVar (devmap, defaults, "REMOTE_IPADDR"); netmask = GetDeviceVar (devmap, defaults, "NETMASK"); mtu = GetDeviceVar (devmap, defaults, "MTU"); ethtool_options = GetDeviceVar (devmap, defaults, "ETHTOOL_OPTIONS"); startmode = GetDeviceVar (devmap, defaults, "STARTMODE"); -y2internal("startmode %1", startmode); usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); @@ -815,6 +817,7 @@ global map SysconfigDefaults = $[ "BOOTPROTO": "static", "IPADDR": "", + "PREFIXLEN": "", "REMOTE_IPADDR": "", "NETMASK": "", "MTU": "", @@ -934,11 +937,8 @@ /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); -y2internal("devmap %1", devmap); - SetDeviceVars(devmap, SysconfigDefaults); - hotplug = ""; /* if(issubstring(device, "bus-pcmcia")) @@ -1009,7 +1009,8 @@ // #104494 - always write IPADDR+NETMASK, even empty newdev["IPADDR"] = ipaddr; - newdev["NETMASK"] = netmask; + if(size(prefix)>0) newdev["PREFIXLEN"] = prefix; + else newdev["NETMASK"] = netmask; // #50955 omit computable fields newdev["BROADCAST"] = ""; newdev["NETWORK"] = ""; Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=48381&r1=48380&r2=48381&view=diff ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Wed Jun 18 12:17:20 2008 @@ -10,8 +10,8 @@ BuildRequires: yast2 >= 2.16.6 BuildRequires: yast2-packager >= 2.16.37 -# GetInstArgs::automatic_configuration -Requires: yast2 >= 2.16.46 +# needed for prefixlen support +Requires: yast2 >= 2.17.1 Requires: sysconfig Requires: yast2-packager >= 2.16.37 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org