Author: aschnell Date: Fri Mar 26 12:09:29 2010 New Revision: 61510 URL: http://svn.opensuse.org/viewcvs/yast?rev=61510&view=rev Log: - fixed setting password for encrypted LVM proposal (bnc #591075) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc?rev=61510&r1=61509&r2=61510&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Fri Mar 26 12:09:29 2010 @@ -1473,7 +1473,7 @@ checkRelaxed ); getStorage()->logCo( this ); int ret = createChecks( type, start, len, checkRelaxed ); - int number = 0; + unsigned number = 0; if( ret==0 ) { number = availablePartNumber( type ); @@ -1497,6 +1497,20 @@ y2mil( "deleted at same start:" << *i ); p->getFsInfo( &(*i) ); } + + // see bnc #591075 + if (getStorage()->instsys()) + { + for (i = pp.begin(); i != pp.end(); ++i) + { + if (i->deleted() && i->nr() == number && !i->getCryptPwd().empty()) + { + y2mil("harvesting old password"); + p->setCryptPwd(i->getCryptPwd()); + } + } + } + p->setCreated(); device = p->device(); addToList( p ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=61510&r1=61509&r2=61510&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Mar 26 12:09:29 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Mar 26 12:02:43 CET 2010 - aschnell@suse.de + +- fixed setting password for encrypted LVM proposal (bnc #591075) + +------------------------------------------------------------------- Thu Mar 25 11:20:52 CET 2010 - fehr@suse.de - fix bug when using mount-by-UUID for swap (bnc #591061) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org