Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47485 - in /trunk/yast2: VERSION library/network/src/NetworkStorage.ycp package/yast2.changes
  • From: mzugec@xxxxxxxxxxxxxxxx
  • Date: Tue, 13 May 2008 11:54:39 -0000
  • Message-id: <20080513115439.D510132C2C@xxxxxxxxxxxxxxxx>
Author: mzugec
Date: Tue May 13 13:54:39 2008
New Revision: 47485

URL: http://svn.opensuse.org/viewcvs/yast?rev=47485&view=rev
Log:
isDiskOnNetwork::NetworkStorage added test for nfs (bnc#384420)

Modified:
trunk/yast2/VERSION
trunk/yast2/library/network/src/NetworkStorage.ycp
trunk/yast2/package/yast2.changes

Modified: trunk/yast2/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=47485&r1=47484&r2=47485&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Tue May 13 13:54:39 2008
@@ -1 +1 @@
-2.16.65
+2.16.66

Modified: trunk/yast2/library/network/src/NetworkStorage.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=47485&r1=47484&r2=47485&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkStorage.ycp (original)
+++ trunk/yast2/library/network/src/NetworkStorage.ycp Tue May 13 13:54:39 2008
@@ -26,17 +26,22 @@
* @return root dev over network
*/
global boolean isDiskOnNetwork(string device){
- boolean ret=false;
+ boolean network_based=false;
+ // test for iSCSI
foreach(map<string, any> disk, (list<map<string, any>
)SCR::Read(.probe.disk), {
y2milestone("%1", disk["dev_name"]:"");
-y2internal("%1", device);
+ y2internal("%1", device);
if (disk["dev_name"]:""==device){
foreach(string row, disk["dev_names"]:[], {
- if (issubstring(row, "iscsi")) ret=true;
+ if (issubstring(row, "iscsi")) network_based=true;
});
}
});
- return ret;
+ // test for nfs
+ if (!network_based) {
+ if (SCR::Execute(.target.bash, sformat("grep nfs /proc/mounts |cut -d' ' -f
2|grep -q %1", device))!=0) network_based=true;
+ }
+ return network_based;
}



Modified: trunk/yast2/package/yast2.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=47485&r1=47484&r2=47485&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Tue May 13 13:54:39 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue May 13 13:49:40 CEST 2008 - mzugec@xxxxxxx
+
+- isDiskOnNetwork::NetworkStorage added test for nfs (bnc#384420)
+- 2.16.66
+
+-------------------------------------------------------------------
Tue May 13 12:41:55 CEST 2008 - lslezak@xxxxxxx

- PackageSystem::EnsureSourceInit() - do not display "No package

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages