Author: ug Date: Tue Apr 24 13:35:45 2012 New Revision: 68004 URL: http://svn.opensuse.org/viewcvs/yast?rev=68004&view=rev Log: fixed rnc file Modified: 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/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=68004&r1=68003&r2=68004&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Apr 24 13:35:45 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 24 13:35:28 CEST 2012 - ug@suse.de + +- keep_install_network added to rnc file + +------------------------------------------------------------------- Wed Apr 11 11:13:51 CEST 2012 - mvidner@suse.cz - Fixed a dead reference to proxy code; moved a forgotten file. Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=68004&r1=68003&r2=68004&view=diff ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Tue Apr 24 13:35:45 2012 @@ -257,6 +257,7 @@ ret["managed"] = settings["managed"]:false; if(haskey(settings, "ipv6")) ret["ipv6"] = settings["ipv6"]:true; + ret["keep_install_network"] = settings["keep_install_network"]:false; 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=68004&r1=68003&r2=68004&view=diff ============================================================================== --- trunk/network/src/config/networking.rnc (original) +++ trunk/network/src/config/networking.rnc Tue Apr 24 13:35:45 2012 @@ -6,6 +6,7 @@ networking = element networking { element start_immediately { BOOLEAN }? & + element keep_install_network { BOOLEAN }? & ipv6? & managed? & strict_IP_check_timeout? & Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=68004&r1=68003&r2=68004&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Apr 24 13:35:45 2012 @@ -614,6 +614,7 @@ LanItems::autoinstall_settings["start_immediately"] = settings["start_immediately"]:false; LanItems::autoinstall_settings["strict_IP_check_timeout"] = settings["strict_IP_check_timeout"]:-1; + LanItems::autoinstall_settings["keep_install_network"] = settings["keep_install_network"]:false; NetworkConfig::Import(settings["config"]:$[]); DNS::Import((map) eval(settings["dns"]:$[])); @@ -643,6 +644,7 @@ "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), "start_immediately": LanItems::autoinstall_settings["start_immediately"]:false, //start_immediately, + "keep_install_network": LanItems::autoinstall_settings["keep_install_network"]:false, ]; 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