Author: mzugec
Date: Tue Dec 2 14:13:00 2008
New Revision: 53808
URL: http://svn.opensuse.org/viewcvs/yast?rev=53808&view=rev
Log:
improved rootfs on network-based disk detection (bnc#445004)
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=53808&r1=53807&r2=53808&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Tue Dec 2 14:13:00 2008
@@ -1 +1 @@
-2.17.53
+2.17.54
Modified: trunk/yast2/library/network/src/NetworkStorage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=53808&r1=53807&r2=53808&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkStorage.ycp (original)
+++ trunk/yast2/library/network/src/NetworkStorage.ycp Tue Dec 2 14:13:00 2008
@@ -13,6 +13,8 @@
module "NetworkStorage";
+import "FileUtils";
+
global string getDevice(string mount_point){
map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|tr -d '\n'", mount_point));
list<string> rows = splitstring(out["stdout"]:"", " ");
@@ -30,19 +32,53 @@
* @return root dev over network
*/
global boolean isDiskOnNetwork(string device){
+ y2milestone("begin isDiskOnNetwork(%1) function", device);
if (device=="nfs") return true;
boolean network_based=false;
- // test for iSCSI
- foreach(map disk, (list