[yast-commit] r59611 - in /trunk/storage: package/yast2-storage.changes storage/src/inst_target_selection.ycp storage/src/modules/Storage.ycp storage/src/modules/StorageSettings.ycp
Author: aschnell Date: Thu Nov 19 10:36:39 2009 New Revision: 59611 URL: http://svn.opensuse.org/viewcvs/yast?rev=59611&view=rev Log: - keep name entry in target-map as provided by libstorage Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_target_selection.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageSettings.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=59611&r1=59610&r2=59611&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Nov 19 10:36:39 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 19 10:32:36 CET 2009 - aschnell@suse.de + +- keep name entry in target-map as provided by libstorage + +------------------------------------------------------------------- Tue Nov 17 12:03:12 CET 2009 - aschnell@suse.de - improved focus handling during creation of logical volumes Modified: trunk/storage/storage/src/inst_target_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_selection.ycp?rev=59611&r1=59610&r2=59611&view=diff ============================================================================== --- trunk/storage/storage/src/inst_target_selection.ycp (original) +++ trunk/storage/storage/src/inst_target_selection.ycp Thu Nov 19 10:36:39 2009 @@ -88,6 +88,8 @@ integer i = 1; foreach(string tname, map tdata, usable_target_map, { string tlinename = tdata["name"]:"?"; + if (haskey(tdata, "name")) + tlinename = tdata["proposal_name"]:"?"; if( tdata["type"]:`CT_UNKNOWN==`CT_DMRAID ) tlinename = "BIOS RAID " + tdata["name"]:"?"; string tline = "&" + i + ": " + tlinename; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=59611&r1=59610&r2=59611&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Nov 19 10:36:39 2009 @@ -1532,7 +1532,7 @@ map toDiskMap( map disk, map cinfo ) { - list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", + list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "name", "device", "max_logical", "max_primary", "type", "readonly", "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; @@ -3127,12 +3127,13 @@ ``{ disk = getDiskInfo( dev, disk ); integer s = disk["size_k"]:0 * 1024; - disk["name"] = disk["dname"]:"" + + string proposal_name = disk["dname"]:"" + Storage::ByteToHumanString( s ) + ", " + disk["device"]:"" + ", "; if( size( disk["vendor"]:"")>0 ) - disk["name"] = disk["name"]:"" + disk["vendor"]:"" + "-"; - disk["name"] = disk["name"]:"" + disk["model"]:""; + proposal_name = proposal_name + disk["vendor"]:"" + "-"; + proposal_name = proposal_name + disk["model"]:""; + disk["proposal_name"] = proposal_name; if( haskey( disk, "dname" )) disk = remove( disk, "dname" ); tmp[dev] = disk; Modified: trunk/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageSettings.ycp?rev=59611&r1=59610&r2=59611&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageSettings.ycp (original) +++ trunk/storage/storage/src/modules/StorageSettings.ycp Thu Nov 19 10:36:39 2009 @@ -34,6 +34,7 @@ modified = true; } + global void SetDisplayName(symbol new_display_name) { display_name = new_display_name; @@ -68,12 +69,8 @@ break; } - if (ret == "") - ret = data["device"]:""; - - integer pos = findlastof(ret, "/"); - if (pos != nil) - ret = substring(ret, pos + 1); + if (isempty(ret)) + ret = data["name"]:""; return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
aschnell@svn.opensuse.org