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 + * + * $Id: NetworkStorage.ycp 38154 2007-05-28 08:20:39Z mzugec $ + * + * #176804 - Root on iSCSI installation fails + */ + +{ + +module "NetworkStorage"; + +global string getDevice(string mount_point){ + map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1|tr -d '\n'", mount_point)); + string device=deletechars(out["stdout"]:"", "1234567890"); + y2internal("%1", device); + return device; +} + +/** + * If the disk is on a networked device (NFS, ISCSI), + * the main NIC needs STARTMODE nfsroot instead of auto. + * @return root dev over network + */ +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map disk, (list >)SCR::Read(.probe.disk), { + y2milestone("%1", disk["dev_name"]:""); +y2internal("%1", device); + if (disk["dev_name"]:""==device){ + foreach(string row, disk["dev_names"]:[], { + if (issubstring(row, "iscsi")) ret=true; + }); + } + }); + return ret; +} + + +/* EOF */ +} Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=38231&r1=38230&r2=38231&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jun 1 09:52:51 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 1 09:51:24 CEST 2007 - mzugec@suse.cz + +- add function NetworkService::isNetworkRunning() +- NetworkStorage moved here from yast2-network +- 2.15.35 + +------------------------------------------------------------------- Wed May 30 13:48:27 CEST 2007 - sh@suse.de - Fixed bug #278790: save_y2logs complains about missing RPM DB -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org