Author: lslezak Date: Fri Oct 17 10:59:33 2008 New Revision: 52323 URL: http://svn.opensuse.org/viewcvs/yast?rev=52323&view=rev Log: - fixed network detection command (bnc#435970) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Network.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=52323&r1=52322&r2=52323&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 17 10:59:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 17 10:58:43 CEST 2008 - lslezak@suse.cz + +- fixed network detection command (bnc#435970) + +------------------------------------------------------------------- Wed Oct 15 10:56:06 CEST 2008 - lslezak@suse.cz - report SourceChanged callback also during package installation Modified: trunk/pkg-bindings/src/Network.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Network.cc?rev=52323&r1=52322&r2=52323&view=diff ============================================================================== --- trunk/pkg-bindings/src/Network.cc (original) +++ trunk/pkg-bindings/src/Network.cc Fri Oct 17 10:59:33 2008 @@ -46,9 +46,17 @@ bool PkgFunctions::NetworkDetected() { y2milestone("Checking the network status..."); - int result = ::system("ip addr|grep -v 'inet6 ::1\\|inet6 fe80'|grep -q inet6 &> /dev/null"); + // check IPv4 network + int result = ::system("ip addr|grep -v '127.0.0\\|inet6'|grep -q inet &> /dev/null"); y2milestone("Network is running: %s", (result == 0) ? "yes" : "no"); + if (!result) + { + // IPv4 not detected, try IPv6 + result = ::system("ip addr|grep -v 'inet6 ::1\\|inet6 fe80'|grep -q inet6 &> /dev/null"); + y2milestone("Network (IPv6) is running: %s", (result == 0) ? "yes" : "no"); + } + return !result; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org