Author: kmachalkova Date: Fri Dec 21 17:27:32 2007 New Revision: 43226 URL: http://svn.opensuse.org/viewcvs/yast?rev=43226&view=rev Log: Allow setting a route without interface (use '-' which stands for 'any') (#93996) Happy X-mas and merry New Year, do not even try to code during these vacation! :-) Modified: trunk/network/src/lan/help.ycp trunk/network/src/services/routing.ycp Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=43226&r1=43225&r2=43226&view=diff ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Fri Dec 21 17:27:32 2007 @@ -71,6 +71,11 @@ used instead of the default route. The idea of the default route is simply to enable you to say \"and everything else should go here.\"</p> ") + + +_("For each route, enter destination network IP address, gateway address, +and netmask. To omit any of these values, use dash sign \"-\". Select also +the device through which the traffic to defined network will be routed ( +\"-\" stands for any interface).") + /* Routing dialog help 2/2 */ _("<p>Enable <b>IP Forwarding</b> if the system is a router.</p>"), Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp?rev=43226&r1=43225&r2=43226&view=diff ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Fri Dec 21 17:27:32 2007 @@ -48,7 +48,7 @@ /* TextEntry label */ `TextEntry(`id(`netmask), _("&Netmask"), entry[3]:""), /* ComboBox label */ - `ComboBox(`id(`device), `opt(`editable, `hstretch), _("De&vice (optional)"), devs), + `ComboBox(`id(`device), `opt(`editable, `hstretch), _("De&vice"), devs), `TextEntry (`id(`options), Label::Options (), entry[5]:"") ), `HSpacing(1), @@ -58,8 +58,14 @@ ) )); + //Allow declaring route without iface (for gateway) #93996 + //if empty, use '-' which stands for any if(entry[4]:"" != "") - UI::ChangeWidget(`id(`device), `Value, entry[4]:""); + UI::ChangeWidget(`id(`device), `Value, entry[4]:""); + else { + devs= add(devs,"-"); + UI::ChangeWidget(`id(`device), `Items, devs); + } UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-"); UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-"); UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org