[yast-commit] r49732 - in /trunk/storage: libstorage/src/Container.cc libstorage/src/StorageInterface.h libstorage/src/StorageTypes.h storage/src/modules/Storage.ycp storage/src/modules/StorageFields.ycp

Author: aschnell Date: Tue Aug 5 17:53:22 2008 New Revision: 49732 URL: http://svn.opensuse.org/viewcvs/yast?rev=49732&view=rev Log: - more evms removal Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/StorageTypes.h trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=49732&r1=49731&r2=49732&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Tue Aug 5 17:53:22 2008 @@ -417,5 +417,5 @@ } const string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", - "DM", "EVMS", "DMRAID", "NFS" }; + "DM", "DMRAID", "NFS" }; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49732&r1=49731&r2=49732&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Aug 5 17:53:22 2008 @@ -114,7 +114,7 @@ enum UsedByType { UB_NONE, UB_LVM, UB_MD, UB_DM, UB_DMRAID }; - enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, EVMS, DMRAID, NFSC, + enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, DMRAID, NFSC, COTYPE_LAST_ENTRY }; /** Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTypes.h?rev=49732&r1=49731&r2=49732&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue Aug 5 17:53:22 2008 @@ -19,7 +19,6 @@ 7, // LOOP 5, // LVM 4, // DM - 6, // EVMS 2, // DMRAID 8 // NFSC }; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49732&r1=49731&r2=49732&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 17:53:22 2008 @@ -72,7 +72,6 @@ LibStorage::MD() : `CT_MD, LibStorage::LOOP() : `CT_LOOP, LibStorage::LVM() : `CT_LVM, - LibStorage::EVMS() : `CT_EVMS, LibStorage::DMRAID() : `CT_DMRAID, LibStorage::DM() : `CT_DM, LibStorage::NFSC() : `CT_NFS Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=49732&r1=49731&r2=49732&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Aug 5 17:53:22 2008 @@ -26,7 +26,7 @@ global void IterateTargetMap(map target_map, void(map, map) callback) { const map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, - `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; + `CT_LVM : 4, `CT_DM : 6, `CT_NFS : 7 ]; list<string> keys = maplist(string dev, map disk, target_map, { return dev; }); keys = sort(string a, string b, keys, { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org