Author: aschnell Date: Wed Aug 4 15:39:22 2010 New Revision: 62342 URL: http://svn.opensuse.org/viewcvs/yast?rev=62342&view=rev Log: - display transport type as bus Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=62342&r1=62341&r2=62342&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 4 15:39:22 2010 @@ -217,6 +217,20 @@ ] ]; +map conv_transport = + $[ "def_sym" : `unknown, + "def_int" : LibStorage::TUNKNOWN(), + "m" : $[ LibStorage::SBP() : `sbp, + LibStorage::ATA() : `ata, + LibStorage::FC() : `fc, + LibStorage::ISCSI() : `iscsi, + LibStorage::SAS() : `sas, + LibStorage::SATA() : `sata, + LibStorage::SPI() : `spi, + LibStorage::USB() : `usb + ] + ]; + map DiskMapVersion = $[]; map DiskMap = $[]; @@ -1185,7 +1199,12 @@ d["label"] = LibStorage::DiskInfo::swig_disklabel_get(dinfo); d["max_logical"] = LibStorage::DiskInfo::swig_maxLogical_get(dinfo); d["max_primary"] = LibStorage::DiskInfo::swig_maxPrimary_get(dinfo); - boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); + + integer t = LibStorage::DiskInfo::swig_transport_get(dinfo); + d["transport"] = toSymbol(conv_transport, t); + + boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); bt = true; + if( bt ) d["iscsi"] = true; else if( haskey( d, "iscsi" )) @@ -1639,7 +1658,7 @@ map toDiskMap( map disk, map cinfo ) { list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "name", "device", - "max_logical", "max_primary", "type", "readonly", + "max_logical", "max_primary", "type", "readonly", "transport", "iscsi", "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=62342&r1=62341&r2=62342&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Wed Aug 4 15:39:22 2010 @@ -733,7 +733,10 @@ case `bus: { - string value = data["bus"]:""; + map names = $[ `sbp : "Firewire", `ata : "ATA", + `fc : "Fibre Channel", `iscsi : "iSCSI", `sas : "SAS", + `sata : "SATA", `spi : "SCSI", `usb : "USB" ]; + string value = names[data["transport"]:`unknown]:""; if (style == `table) return value; else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org