Author: mzugec
Date: Fri Jun 1 09:52:51 2007
New Revision: 38231
URL: http://svn.opensuse.org/viewcvs/yast?rev=38231&view=rev
Log:
add function NetworkService::isNetworkRunning()
NetworkStorage moved here from yast2-network
Added:
trunk/yast2/library/network/src/NetworkStorage.ycp
Modified:
trunk/yast2/VERSION
trunk/yast2/library/network/src/Makefile.am
trunk/yast2/library/network/src/NetworkService.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=38231&r1=38230&r2=38231&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Fri Jun 1 09:52:51 2007
@@ -1 +1 @@
-2.15.34
+2.15.35
Modified: trunk/yast2/library/network/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Makefile.am?rev=38231&r1=38230&r2=38231&view=diff
==============================================================================
--- trunk/yast2/library/network/src/Makefile.am (original)
+++ trunk/yast2/library/network/src/Makefile.am Fri Jun 1 09:52:51 2007
@@ -11,6 +11,7 @@
NetworkDevices.ycp \
NetworkPopup.ycp \
NetworkService.ycp \
+ NetworkStorage.ycp \
SuSEFirewall.ycp \
SuSEFirewallServices.ycp \
SuSEFirewallExpertRules.ycp \
Modified: trunk/yast2/library/network/src/NetworkService.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkService.ycp?rev=38231&r1=38230&r2=38231&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkService.ycp (original)
+++ trunk/yast2/library/network/src/NetworkService.ycp Fri Jun 1 09:52:51 2007
@@ -128,5 +128,19 @@
}
}
+
+global boolean isNetworkRunning(){
+ 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")) {
+ y2milestone ("Network is running ...");
+ return true;
+ } else {
+ y2milestone("Network is not running ...");
+ return false;
+ }
+
+}
+
/* EOF */
}
Added: trunk/yast2/library/network/src/NetworkStorage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=38231&view=auto
==============================================================================
--- trunk/yast2/library/network/src/NetworkStorage.ycp (added)
+++ trunk/yast2/library/network/src/NetworkStorage.ycp Fri Jun 1 09:52:51 2007
@@ -0,0 +1,44 @@
+/**
+ * File: modules/NetworkStorage.ycp
+ * Package: Network configuration
+ * Summary: Networked disks
+ * Authors: Martin Vidner