Author: mvidner Date: Tue Jan 31 17:36:39 2012 New Revision: 67336 URL: http://svn.opensuse.org/viewcvs/yast?rev=67336&view=rev Log: Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/NetworkStorage.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67336&r1=67335&r2=67336&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jan 31 17:36:39 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 31 17:36:27 CET 2012 - mvidner@suse.cz + +- Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12) + +------------------------------------------------------------------- Tue Jan 24 16:28:37 CET 2012 - mvidner@suse.cz - Fixed broken autoyast in general (bnc#742855) Modified: trunk/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetworkStorage.ycp?rev=67336&r1=67335&r2=67336&view=diff ============================================================================== --- trunk/network/src/modules/NetworkStorage.ycp (original) +++ trunk/network/src/modules/NetworkStorage.ycp Tue Jan 31 17:36:39 2012 @@ -36,26 +36,7 @@ * @return root dev over network: `no `iscsi `nfs `fcoe */ global symbol isDiskOnNetwork(string device) { - y2milestone("begin isDiskOnNetwork(%1) function", device); - if (device=="nfs") { - return `nfs; - } - if (size(device)==0) { - y2error("Empty parameter for isDiskOnNetwork() function"); - return `no; - } - - symbol network_based = Storage::IsDeviceOnNetwork(device); - - // test for nfs (bnc#384420) - if (network_based == `no) { - string space="[[:space:]]"; - if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){ - y2milestone("device %1 is network based : %2", device, network_based); - network_based = `nfs; - } - } - return network_based; + return Storage::IsDeviceOnNetwork(device); } global list<string> getiBFTDevices() { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org