Author: mzugec Date: Fri Jun 1 12:42:06 2007 New Revision: 38240 URL: http://svn.opensuse.org/viewcvs/yast?rev=38240&view=rev Log: use shared isNetworkRunning() function in network_finish Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/network_finish.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38240&r1=38239&r2=38240&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Jun 1 12:42:06 2007 @@ -1 +1 @@ -2.15.27 +2.15.28 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=38240&r1=38239&r2=38240&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jun 1 12:42:06 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 1 12:41:10 CEST 2007 - mzugec@suse.cz + +- use shared isNetworkRunning() function in network_finish +- 2.15.28 + +------------------------------------------------------------------- Wed May 30 11:33:52 CEST 2007 - mzugec@suse.cz - fixed spec requirements Modified: trunk/installation/src/clients/network_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/network_finish.ycp?rev=38240&r1=38239&r2=38240&view=diff ============================================================================== --- trunk/installation/src/clients/network_finish.ycp (original) +++ trunk/installation/src/clients/network_finish.ycp Fri Jun 1 12:42:06 2007 @@ -21,6 +21,7 @@ import "Arch"; import "Linuxrc"; import "String"; +import "NetworkService"; any ret = nil; string func = ""; @@ -50,9 +51,7 @@ { // if network running, write network configuration - map output = (map)SCR::Execute(.target.bash_output, - "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); - if (issubstring(output["stdout"]:"", "network")) + if (NetworkService::isNetworkRunning()) { y2milestone("Save network configuration"); WFM::CallFunction ("save_network"); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=38240&r1=38239&r2=38240&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Jun 1 12:42:06 2007 @@ -3,7 +3,7 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite yast2-country -BuildRequires: yast2 >= 2.15.22 +BuildRequires: yast2 >= 2.15.35 Requires: autoyast2-installation # WorkflowManager module, Installation::reboot_net_settings @@ -29,7 +29,8 @@ Conflicts: yast2-pkg-bindings < 2.13.101 # 'Product' and 'Installation' moved to 'yast2' -Conflicts: yast2 < 2.15.18 +# needs NetworkService::isNetworkRunning() from yast2 +Conflicts: yast2 < 2.15.35 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) Requires: tar gzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org