Author: fehr Date: Tue May 8 15:24:56 2012 New Revision: 68098 URL: http://svn.opensuse.org/viewcvs/yast?rev=68098&view=rev Log: addtional fix for bnc#755704 Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc?rev=68098&r1=68097&r2=68098&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc Tue May 8 15:24:56 2012 @@ -2537,7 +2537,9 @@ if(haveBtrfs(co)) { string mp = vol->getMount(); + bool mounted = vol->isMounted(); bool mby_uuid = vol->getMountBy()==MOUNTBY_UUID; + y2mil( "mounted btrfs:" << mounted ); co->eraseVolume( &(*vol) ); if( findVolume( device, vol ) && vol->cType()!=BTRFSC ) { @@ -2545,10 +2547,15 @@ vol->clearUsedBy(); vol->changeMount( mp ); if( !mp.empty() ) + { vol->setMount(mp); + if( mounted ) + vol->setMounted(); + } if( mby_uuid ) vol->changeMountBy( vol->defaultMountBy() ); ret = vol->setFormat( format, fs ); + y2mil( "mounted plain:" << vol->isMounted() ); } else y2war( "base volume for " << device << " not found" ); Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h?rev=68098&r1=68097&r2=68098&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.h Tue May 8 15:24:56 2012 @@ -170,6 +170,7 @@ int resizeFs(); void fstabUpdateDone(); bool isMounted() const { return( is_mounted ); } + void setMounted( bool mtd=true ) { is_mounted=mtd; } virtual Text removeText(bool doing) const; virtual Text createText(bool doing) const; virtual Text resizeText(bool doing) const; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org