Author: mzugec Date: Fri Jun 6 17:27:31 2008 New Revision: 48122 URL: http://svn.opensuse.org/viewcvs/yast?rev=48122&view=rev Log: installation onto nfs - STARTMODE='nfsroot' (bnc#397410) 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=48122&r1=48121&r2=48122&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jun 6 17:27:31 2008 @@ -1 +1 @@ -2.16.71 +2.16.72 Modified: trunk/yast2/library/network/src/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=48122&r1=48121&r2=48122&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkStorage.ycp (original) +++ trunk/yast2/library/network/src/NetworkStorage.ycp Fri Jun 6 17:27:31 2008 @@ -14,9 +14,13 @@ 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); + 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"]:"", " "); + y2internal("rows %1", rows); + string device=""; + if (rows[2]:""=="nfs") device="nfs"; + else device=rows[0]:""; + y2internal("device %1", device); return device; } @@ -26,6 +30,7 @@ * @return root dev over network */ global boolean isDiskOnNetwork(string device){ + if (device=="nfs") return true; boolean network_based=false; // test for iSCSI foreach(map disk, (list >)SCR::Read(.probe.disk), { Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=48122&r1=48121&r2=48122&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jun 6 17:27:31 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 6 17:27:09 CEST 2008 - mzugec@suse.cz + +- installation onto nfs - STARTMODE='nfsroot' (bnc#397410) +- 2.16.72 + +------------------------------------------------------------------- Fri Jun 6 12:50:02 CEST 2008 - locilka@suse.cz - Fixed Progress stages layout, stage-mark has a reseved space now -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org