Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49580 - in /trunk/storage/storage/src/include: lvm_lv_lib.ycp lvm_pv_lib.ycp signatures.ycp
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Fri, 01 Aug 2008 13:28:07 -0000
  • Message-id: <20080801132807.73D5A272F1@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Fri Aug 1 15:28:07 2008
New Revision: 49580

URL: http://svn.opensuse.org/viewcvs/yast?rev=49580&view=rev
Log:
- removed obsolete code

Modified:
trunk/storage/storage/src/include/lvm_lv_lib.ycp
trunk/storage/storage/src/include/lvm_pv_lib.ycp
trunk/storage/storage/src/include/signatures.ycp

Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_lv_lib.ycp?rev=49580&r1=49579&r2=49580&view=diff
==============================================================================
--- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original)
+++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Fri Aug 1 15:28:07 2008
@@ -122,73 +122,6 @@



////////////////////////////////////////////////////////////////////////////////
- // Get all logical volumes and mounted partitions
-
-define list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap,
- boolean view_all_mnts,
- string current_vg )
- ``{
- list<map> ret = [];
- integer pesize = targetMap["/dev/"+current_vg,"cyl_size"]:(4096*1024);
- y2milestone( "current_vg=%2 pesize=%1", pesize, current_vg );
-
- //////////////////////////////////////////////////////////////////////
- // add the devicename i.e /dev/hda1 or /dev/system/usr to partition list
- // and the device key <subdevice>/<maindevice> i.e. 1//dev/hda
-
- targetMap = mapmap( string dev, map devmap, targetMap,
- ``{
- boolean is_lvm_vg = devmap["type"]:`CT_UNKNOWN==`CT_LVM;
- integer cyl_size = devmap["cyl_size"]:0;
-
- list partitions = maplist( map part, devmap["partitions"]:[],
- ``{
- if( is_lvm_vg )
- {
- part["lvm_name"] = devmap["name"]:"";
- }
- part["size_str"] = ByteToHumanStringWithZero(part["size_k"]:0*1024);
-
- part["maindev"] = dev;
- y2debug("devname %1 size %2 pe %3", part["device"]:"",
- part["size_k"]:0*1024, pesize );
- return( part );
- });
-
- devmap["partitions"] = partitions;
- return( $[ dev: devmap ] );
- });
-
- ////////////////////////////////////////////////////////////
- // Look for all partitions:
- //
- // normal partition with mountpoint
- // logical volume
-
- if( !view_all_mnts )
- {
- string f = "/" + current_vg + "/";
- // only to current vg depending vgs ...
- foreach( string dev, map devmap, targetMap,
- ``{
- ret = (list<map>)union( ret, filter( map part,
devmap["partitions"]:[],
- ``( part["type"]:`none == `lvm &&
- search( part["device"]:"", f )==4 )));
- });
- }
- else
- {
- foreach( string dev, map devmap, targetMap,
- ``{
- ret = (list<map>)merge( ret, filter( map part,
devmap["partitions"]:[],
- ``( size(part["mount"]:"")>0 ||
- part["type"]:`none == `lvm )));
- });
- }
- return( ret );
- };
-
-
////////////////////////////////////////////////////////////////////////////////
// Get all existing lv names of a volume group

list<string> get_lv_names(map<string, map> target_map, string vg_name)

Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_pv_lib.ycp?rev=49580&r1=49579&r2=49580&view=diff
==============================================================================
--- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original)
+++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 15:28:07 2008
@@ -234,61 +234,6 @@
};


-
- //////////////////////////////////////////////////////////////////////
- // partition list to widget table
- // in:
- // [ $["fsid":Partitions::fsid_lvm,
- // "fstype":"LVM",
- // "nr":"var",
- // "region":[255, 16],
- // "type":`primary],
- // $[
- // "fsid":131,
- // "fstype":"Linux native",
- // "nr":4, "region":[271, 844],
- // ...
- //
- // out:
- // [
- // `item(`id("/dev/hda1"), "/dev/hda1 ", " 2G ", " LVM ", "
system"),
- // `item(`id("/dev/hda2"), "/dev/hda2 ", " 1G ", " Linux ", " ")
- // ];
-
-define list get_pv_widget_table( list<map> possPvList )
- ``{
- list ret = [];
-
- possPvList =
- sort( map x, map y, possPvList,
- ``{
- if( x["maindev"]:"" == y["maindev"]:"")
- {
- if( haskey( x, "nr" ))
- return( x["nr"]:0 < y["nr"]:0);
- else
- return( x["name"]:"" < y["name"]:"");
- }
- else
- {
- return( x["maindev"]:"" < y["maindev"]:"" );
- }
- });
-
- return( maplist( map p, possPvList,
- ``{
- return(`item( `id(p["device"]:"--"),
- p["device"]:"--",
- ByteToHumanStringWithZero(p["size_k"]:0*1024),
- p["fstype"]:"--",
- p["used_by"]:"--"
- ));
- }
- ));
- };
-
-
-
/**
* Check if the user can delete the partition.
* -> Existing LVM partition with volume group

Modified: trunk/storage/storage/src/include/signatures.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/signatures.ycp?rev=49580&r1=49579&r2=49580&view=diff
==============================================================================
--- trunk/storage/storage/src/include/signatures.ycp (original)
+++ trunk/storage/storage/src/include/signatures.ycp Fri Aug 1 15:28:07 2008
@@ -16,8 +16,6 @@
map DlgCreateVolumeGroup( list vgm_list );
void new_vg_list( list vg_list );
integer pesize_str_to_byte( string input );
-list<map> get_lvs_and_mounted_partitions( map<string,map> targetMap, boolean
view_all_mnts,
- string current_vg );
list get_lv_size_info( map<string,map> targetMap, string current_vg );

void signature_dummy() ``{ return; }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages