Author: aschnell
Date: Wed May 12 16:57:07 2010
New Revision: 62005
URL: http://svn.opensuse.org/viewcvs/yast?rev=62005&view=rev
Log:
- make defaultDiskLabel depend on logical sector size
Modified:
trunk/storage/storage/src/include/ep-hd-lib.ycp
trunk/storage/storage/src/modules/Partitions.ycp
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-lib.ycp?rev=62005&r1=62004&r2=62005&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-hd-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed May 12 16:57:07 2010
@@ -29,7 +29,7 @@
return;
}
- string default_label = Storage::DefaultDiskLabel(target_map[disk_device, "size_k"]:0);
+ string default_label = Storage::DefaultDiskLabel(disk_device);
list<string> labels = [ default_label ];
if (!contains(labels, "gpt"))
@@ -422,7 +422,7 @@
integer mysize = target_map[ device, "size_k"]:0;
integer mycyl_size = target_map[ device, "cyl_size"]:0;
list <map> myparts = target_map[ device, "partitions"]:[];
- string mypart_table_type = target_map[ device, "label" ]:Storage::DefaultDiskLabel( mysize );
+ string mypart_table_type = target_map[device, "label"]:Storage::DefaultDiskLabel(device);
// helptext
string helptext = _("<p>Select one or more (if available) hard disks
@@ -560,7 +560,7 @@
map disk_info = Storage::GetDisk( target_map, this_disk );
list <map> partitions = target_map[ this_disk, "partitions" ]:[];
list<string> pnames = maplist(map part, partitions, { return part["device"]:""; });
- string part_table_type = disk_info["label"]:Storage::DefaultDiskLabel(disk_info["size_k"]:0);
+ string part_table_type = disk_info["label"]:Storage::DefaultDiskLabel(disk_info["device"]:"");
y2milestone("Deleting these partitions: %1", pnames);
Modified: trunk/storage/storage/src/modules/Partitions.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=62005&r1=62004&r2=62005&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Partitions.ycp (original)
+++ trunk/storage/storage/src/modules/Partitions.ycp Wed May 12 16:57:07 2010
@@ -744,12 +744,12 @@
}
- global integer MaxSizeK(string dlabel)
+ global integer MaxSectors(string dlabel)
{
integer ret = 0;
any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities");
if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps))
- ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps);
+ ret = LibStorage::DlabelCapabilities::swig_maxSectors_get(caps);
y2milestone("MaxSizeK dlabel:%1 ret:%2", dlabel, ret);
return ret;
}
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=62005&r1=62004&r2=62005&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Wed May 12 16:57:07 2010
@@ -1152,6 +1152,7 @@
d["size_k"] = LibStorage::DiskInfo::swig_sizeK_get(dinfo);
d["cyl_size"] = LibStorage::DiskInfo::swig_cylSize_get(dinfo);
d["cyl_count"] = LibStorage::DiskInfo::swig_cyl_get(dinfo);
+ d["sector_size"] = LibStorage::DiskInfo::swig_sectorSize_get(dinfo);
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);
@@ -1603,7 +1604,7 @@
map toDiskMap( map disk, map cinfo )
{
- list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "name", "device",
+ list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "name", "device",
"max_logical", "max_primary", "type", "readonly",
"used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt",
"udev_id", "udev_path" ];
@@ -2073,7 +2074,7 @@
global integer MaxCylLabel( map disk, integer start_cyl )
{
- integer ret = Partitions::MaxSizeK(disk["label"]:"");
+ integer ret = Partitions::MaxSectors(disk["label"]:"") * disk["sector_size"]:512 / 1024;
y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 );
integer cylk2 = disk["cyl_size"]:1/512;
if( cylk2<2 )
@@ -2840,11 +2841,10 @@
}
-global string DefaultDiskLabel(integer size_k)
-{
- y2milestone("DefaultDiskLabel size_k:%1", size_k );
- string label = LibStorage::StorageInterface::defaultDiskLabelSize(sint, size_k);
- y2milestone("DefaultDiskLabel label:%1", label);
+global string DefaultDiskLabel(string disk)
+{
+ string label = LibStorage::StorageInterface::defaultDiskLabel(sint, disk);
+ y2milestone("DefaultDiskLabel disk:%1 label:%2", disk, label);
return label;
}
@@ -2854,15 +2854,11 @@
* @param string the disk to deleted the partition table from
* @return boolean
*/
-global define boolean DeletePartitionTable(string disk, integer size_k)
- ``{
- y2milestone( "DeletePartitionTable %1 size_k:%2", disk, size_k );
- string label =
- LibStorage::StorageInterface::defaultDiskLabelSize( sint, size_k );
- y2milestone( "DeletePartitionTable label:%1", label );
- integer ret =
- LibStorage::StorageInterface::destroyPartitionTable( sint, disk,
- label );
+global boolean DeletePartitionTable(string disk)
+ {
+ y2milestone("DeletePartitionTable disk:%1", disk);
+ string label = DefaultDiskLabel(disk);
+ integer ret = LibStorage::StorageInterface::destroyPartitionTable(sint, disk, label);
if( ret<0 )
y2error( "DeletePartitionTable sint ret:%1", ret );
UpdateTargetMap();
@@ -3787,14 +3783,14 @@
if( target[k,"type"]:`CT_UNKNOWN==`CT_LVM )
DeleteLvmVg( target[k,"name"]:"" );
else if( target[k,"type"]:`CT_UNKNOWN==`CT_DISK )
- DeletePartitionTable( k, target[k,"size_k"]:0 );
+ DeletePartitionTable( k );
else if( target[k,"type"]:`CT_UNKNOWN==`CT_DMRAID )
DeleteDmraid( k );
}
if( target[k,"del_ptable"]:false &&
IsPartType( target[k,"type"]:`CT_UNKNOWN ) )
{
- DeletePartitionTable( k, target[k,"size_k"]:0 );
+ DeletePartitionTable( k );
}
});
keys = maplist( string k, any e, target, ``(k));
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
