Author: mzugec Date: Fri Sep 17 11:27:58 2010 New Revision: 62494 URL: http://svn.opensuse.org/viewcvs/yast?rev=62494&view=rev Log: AY: added IPv6 option (bnc#633310) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/config/networking.rnc trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62494&r1=62493&r2=62494&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Sep 17 11:27:58 2010 @@ -1 +1 @@ -2.19.37 +2.19.38 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62494&r1=62493&r2=62494&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Sep 17 11:27:58 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 17 11:27:05 CEST 2010 - mzugec@suse.cz + +- AY: added IPv6 option (bnc#633310) +- 2.19.38 + +------------------------------------------------------------------- Thu Aug 19 14:08:33 CEST 2010 - mzugec@suse.de - warn user about nm-applet/knetworkmanager (bnc#627273) Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=62494&r1=62493&r2=62494&view=diff ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Fri Sep 17 11:27:58 2010 @@ -253,6 +253,8 @@ map ret = $[]; ret["managed"] = settings["managed"]:false; + if(haskey(settings, "ipv6")) + ret["ipv6"] = settings["ipv6"]:true; if (size(modules) > 0 ) ret["modules"] = modules; if (size(dns) > 0 ) Modified: trunk/network/src/config/networking.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/networking.rnc?rev=62494&r1=62493&r2=62494&view=diff ============================================================================== --- trunk/network/src/config/networking.rnc (original) +++ trunk/network/src/config/networking.rnc Fri Sep 17 11:27:58 2010 @@ -6,6 +6,7 @@ networking = element networking { element start_immediately { BOOLEAN }? & + ipv6? & managed? & strict_IP_check_timeout? & interfaces & @@ -19,6 +20,9 @@ managed = element managed { BOOLEAN } +ipv6 = + element ipv6 { BOOLEAN } + strict_IP_check_timeout = element strict_IP_check_timeout { INTEGER } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=62494&r1=62493&r2=62494&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Sep 17 11:27:58 2010 @@ -609,6 +609,7 @@ DNS::Import((map) eval(settings["dns"]:$[])); Routing::Import((map) eval(settings["routing"]:$[])); NetworkService::SetManaged (settings["managed"]:false); + if(haskey(settings, "ipv6")) ipv6=settings["ipv6"]:true; LanItems::modified = true; return true; @@ -621,18 +622,20 @@ global define map Export() { map devices = NetworkInterfaces::Export("netcard"); map udev_rules = LanUdevAuto::Export(devices); - return $[ + map ay = $[ "dns" : DNS::Export(), // FIXME: MOD "modules" : Modules, "s390-devices" : udev_rules["s390-devices"]:$[], "net-udev" : udev_rules["net-udev"]:$[], "config" : NetworkConfig::Export(), "devices" : devices, -// "hwcfg" : NetworkModules::Export("netcard"), + "ipv6" : ipv6, "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), "start_immediately": LanItems::autoinstall_settings["start_immediately"]:false, //start_immediately, ]; + y2milestone("Exported map: %1", ay); + return ay; } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org