Author: aschnell
Date: Fri Jun 6 23:56:39 2008
New Revision: 48143
URL: http://svn.opensuse.org/viewcvs/yast?rev=48143&view=rev
Log:
- fixed deletion of logical volumes (bnc #397186)
Modified:
branches/SuSE-Linux-11_0-Branch/storage/VERSION
branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.cc
branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.h
branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/LvmVg.cc
branches/SuSE-Linux-11_0-Branch/storage/package/yast2-storage.changes
Modified: branches/SuSE-Linux-11_0-Branch/storage/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/storage/VERSION?rev=48143&r1=48142&r2=48143&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/storage/VERSION (original)
+++ branches/SuSE-Linux-11_0-Branch/storage/VERSION Fri Jun 6 23:56:39 2008
@@ -1 +1 @@
-2.16.25
+2.16.26
Modified: branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.cc?rev=48143&r1=48142&r2=48143&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.cc Fri Jun 6 23:56:39 2008
@@ -333,6 +333,24 @@
setSize( num_le*pec()->peSize() );
}
+
+void Dm::setPeMap( const std::map& m )
+{
+ pe_map = m;
+
+ // remove usused entries
+ // TODO: do not generate pe_maps with unused entries in the first place
+ for(std::map::iterator i = pe_map.begin(); i != pe_map.end(); ) {
+ if (i->second == 0)
+ pe_map.erase(i++);
+ else
+ ++i;
+ }
+
+ y2mil("device:" << device() << " pe_map:" << pe_map);
+}
+
+
void Dm::changeDeviceName( const string& old, const string& nw )
{
map::const_iterator mit = pe_map.find( old );
Modified: branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.h?rev=48143&r1=48142&r2=48143&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.h (original)
+++ branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/Dm.h Fri Jun 6 23:56:39 2008
@@ -29,7 +29,7 @@
bool removeTable();
void calcSize();
const std::map& getPeMap() const { return( pe_map ); }
- void setPeMap( const std::map& m ) { pe_map = m; }
+ void setPeMap( const std::map& m );
unsigned long long usingPe( const string& dev ) const;
bool mapsTo( const string& dev ) const;
void getTableInfo();
Modified: branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/LvmVg.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/LvmVg.cc?rev=48143&r1=48142&r2=48143&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/LvmVg.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/storage/libstorage/src/LvmVg.cc Fri Jun 6 23:56:39 2008
@@ -199,7 +199,7 @@
ret = tryUnusePe( d, pl, pladd, plrem, rem_pe );
++i;
}
- y2mil( "add:" << pv_add.size() << " pv:" << pv.size() << " remove:" << devs.size() );
+ y2mil( "add:" << pv_add.size() << " pv:" << pv.size() << " remove:" << pv_remove.size() );
if( ret==0 && pv_add.size()+pv.size()-devs.size()<=0 )
ret = LVM_VG_HAS_NONE_PV;
if( ret == 0 )
Modified: branches/SuSE-Linux-11_0-Branch/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/storage/package/yast2-storage.changes?rev=48143&r1=48142&r2=48143&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/storage/package/yast2-storage.changes (original)
+++ branches/SuSE-Linux-11_0-Branch/storage/package/yast2-storage.changes Fri Jun 6 23:56:39 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jun 06 23:52:22 CEST 2008 - aschnell@suse.de
+
+- fixed deletion of logical volumes (bnc #397186)
+- version 2.16.26
+
+-------------------------------------------------------------------
Mon Jun 02 15:23:24 CEST 2008 - aschnell@suse.de
- run storage_finish.ycp during live-installation (bug #389188)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
aschnell＠svn.opensuse.org