Mailinglist Archive: yast-commit (129 mails)

[fehr@xxxxxxxxxxxxxxxxx]

Author: fehr
Date: Tue May  8 13:53:52 2012
New Revision: 68096

URL: http://svn.opensuse.org/viewcvs/yast?rev=68096&view=rev
Log:
fix bug formatting a mounted btrfs volume as non-btrfs (bnc#755704)

Modified:
    branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Storage.cc
    branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc
    branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes

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=68096&r1=68095&r2=68096&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 13:53:52 2012
@@ -2537,12 +2537,17 @@
            if(haveBtrfs(co))
                {
                string mp = vol->getMount();
+                bool mby_uuid = vol->getMountBy()==MOUNTBY_UUID;
                co->eraseVolume( &(*vol) );
                if( findVolume( device, vol ) && vol->cType()!=BTRFSC )
                    {
                    vol->updateFsData();
                    vol->clearUsedBy();
                    vol->changeMount( mp );
+                    if( !mp.empty() )
+                        vol->setMount(mp);
+                    if( mby_uuid )
+                        vol->changeMountBy( vol->defaultMountBy() );
                    ret = vol->setFormat( format, fs );
                    }
                else

Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc?rev=68096&r1=68095&r2=68096&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc (original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/Volume.cc Tue May  
8 13:53:52 2012
@@ -1970,6 +1970,13 @@
               ((getStorage()->instsys()&&mp=="swap"&&mp==orig_mp) ||
                fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by ||
                encryption!=orig_encryption);
+    if( ret )
+        {
+        y2mil( "opt:" << fstab_opt << " oopt:" << orig_fstab_opt <<
+               " mby:" << mount_by << " omby:" << orig_mount_by <<
+               " enc:" << encryption << " oenc:" << orig_encryption );
+        y2mil( "dev:" << device() << " ret:" << ret );
+        }
     return( ret );
     }
 

Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=68096&r1=68095&r2=68096&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes 
(original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Tue 
May  8 13:53:52 2012
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue May  8 13:53:07 CEST 2012 - fehr@xxxxxxx
+
+- fix bug formatting a mounted btrfs volume as non-btrfs (bnc#755704)
+
+-------------------------------------------------------------------
 Mon May  7 15:26:13 CEST 2012 - fehr@xxxxxxx
 
 - fix bug during creation of MD devices over multipath devices via

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx