fix LVM encryption when btrfs fs is present (bnc#808020)

yast · Mar 11, 2013 · 7876642 · 7876642
1 parent e9fb753
commit 7876642
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/libstorage/src/LvmVg.cc b/libstorage/src/LvmVg.cc
@@ -223,7 +223,7 @@ LvmVg::extendVg( const list<string>& devs )
 	    pvn.device = d;
 
 	    const Volume* v;
-	    if (getStorage()->findVolume(d, v) && v->dmcrypt())
+	    if (getStorage()->findVolume(d, v, true) && v->dmcrypt())
 		pvn.dmcryptDevice = v->dmcryptDevice();
 
 	    pv_add.push_back( pvn );
@@ -944,7 +944,7 @@ void LvmVg::getVgData( const string& name, bool exists )
 		    p->device = extractNthWord( 2, line );
 
 		    const Volume* v;
-		    if (getStorage()->findVolume(p->device, v))
+		    if (getStorage()->findVolume(p->device, v, true))
 			{
 			p->device = v->device();
 			p->dmcryptDevice = v->dmcryptDevice();

diff --git a/libstorage/src/Storage.cc b/libstorage/src/Storage.cc
@@ -2992,7 +2992,7 @@ Storage::setCryptType( const string& device, bool val, EncryptType typ )
 	{
 	ret = STORAGE_CHANGE_READONLY;
 	}
-    else if( findVolume( device, cont, vol ) )
+    else if( findVolume( device, cont, vol, true ) )
 	{
 	ret = vol->setEncryption( val, typ );
 	}
@@ -3018,7 +3018,7 @@ Storage::getCrypt( const string& device, bool& val )
     y2mil("device:" << device);
     ConstVolIterator vol;
     ConstContIterator cont;
-    if( findVolume( device, cont, vol ) )
+    if( findVolume( device, cont, vol, true ) )
 	{
 	val = vol->getEncryption();
 	}
@@ -3046,7 +3046,7 @@ Storage::verifyCryptPassword( const string& device, const string& pwd,
 	{
 	ret = STORAGE_CHANGE_READONLY;
 	}
-    else if( findVolume( device, vol ) )
+    else if( findVolume( device, vol, false, true ) )
 	{
 	ret = vol->setCryptPwd( pwd );
 	if( ret==0 && vol->detectEncryption()==ENC_UNKNOWN )
@@ -3110,7 +3110,7 @@ Storage::setCryptPassword( const string& device, const string& pwd )
 	{
 	ret = STORAGE_CHANGE_READONLY;
 	}
-    else if( findVolume( device, vol ) )
+    else if( findVolume( device, vol, false, true ) )
 	{
 	ret = vol->setCryptPwd( pwd );
 	if( i!=pwdBuf.end() )
@@ -6386,7 +6386,7 @@ Storage::findDevice( const string& dev, const Device* &vol,
     void
     Storage::setUsedBy(const string& dev, UsedByType type, const string& device)
     {
-	Device* tmp = findDevice(dev);
+	Device* tmp = findDevice(dev,true);
 	if (tmp)
 	{
 	    tmp->setUsedBy(type, device);

diff --git a/libstorage/src/Volume.cc b/libstorage/src/Volume.cc
@@ -1714,7 +1714,9 @@ Volume::setEncryption(bool val, EncryptType typ )
     y2mil("val:" << val << " typ:" << toString(typ));
     if (isUsedBy())
 	{
-	ret = VOLUME_ALREADY_IN_USE;
+	const Volume* btrfs = NULL;
+	if( !getStorage()->isUsedBySingleBtrfs(*this, &btrfs) )
+	    ret = VOLUME_ALREADY_IN_USE;
 	}
     if( ret==0 )
 	{