Mailinglist Archive: yast-commit (490 mails)

[fehr@xxxxxxxxxxxxxxxx]

Author: fehr
Date: Thu Jun 14 18:08:33 2007
New Revision: 38472

URL: http://svn.opensuse.org/viewcvs/yast?rev=38472&view=rev
Log:
fix fs type detection for existing luks encrypted volumes 

Modified:
    trunk/storage/libstorage/src/DmCo.cc
    trunk/storage/libstorage/src/Storage.cc
    trunk/storage/libstorage/src/Storage.h
    trunk/storage/libstorage/src/Volume.cc
    trunk/storage/package/yast2-storage.changes

Modified: trunk/storage/libstorage/src/DmCo.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?rev=38472&r1=38471&r2=38472&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmCo.cc (original)
+++ trunk/storage/libstorage/src/DmCo.cc Thu Jun 14 18:08:33 2007
@@ -154,7 +154,7 @@
                getStorage()->knownDevice( it->first ))
                {
                skip = true;
-               getStorage()->setDmcryptData( it->first, m->device(),
+               getStorage()->setDmcryptData( it->first, m->device(), min_num,
                                              m->sizeK() );
                getStorage()->setUsedBy( it->first, UB_NONE, "" );
                }

Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=38472&r1=38471&r2=38472&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Thu Jun 14 18:08:33 2007
@@ -5337,15 +5337,18 @@
     return( ret );
     }
 
-bool Storage::setDmcryptData( const string& dev, const string& dm, unsigned long long siz )
+bool Storage::setDmcryptData( const string& dev, const string& dm, 
+                              unsigned dmnum, unsigned long long siz )
     {
-    y2milestone( "dev:%s dm:%s sizeK:%llu", dev.c_str(), dm.c_str(), siz );
+    y2milestone( "dev:%s dm:%s dmn:%u sizeK:%llu", dev.c_str(), dm.c_str(), 
+                 dmnum, siz );
     bool ret=false;
     VolIterator v;
     if( dm.find("/temporary-cryptsetup-")==string::npos && 
         findVolume( dev, v ) )
        {
        v->setDmcryptDev( dm, siz!=0 );
+       v->replaceAltName( "/dev/dm-", Dm::dmDeviceName(dmnum) );
        v->setSize( siz );
        ret = true;
        }

Modified: trunk/storage/libstorage/src/Storage.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=38472&r1=38471&r2=38472&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.h (original)
+++ trunk/storage/libstorage/src/Storage.h Thu Jun 14 18:08:33 2007
@@ -231,7 +231,8 @@
                        const string& name );
        bool canUseDevice( const string& dev, bool disks_allowed=false );
        bool knownDevice( const string& dev, bool disks_allowed=false );
-       bool setDmcryptData( const string& dev, const string& dm, unsigned long long siz );
+       bool setDmcryptData( const string& dev, const string& dm, 
+                            unsigned dmnum, unsigned long long siz );
        bool deletedDevice( const string& dev );
        bool isDisk( const string& dev );
        const Volume* getVolume( const string& dev );

Modified: trunk/storage/libstorage/src/Volume.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=38472&r1=38471&r2=38472&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Volume.cc (original)
+++ trunk/storage/libstorage/src/Volume.cc Thu Jun 14 18:08:33 2007
@@ -1756,8 +1756,13 @@
     list<string>::iterator i =
        find_if( alt_names.begin(), alt_names.end(), find_begin( prefix ) );
     if( i!=alt_names.end() )
-       *i = newn;
-    else
+       {
+       if( !newn.empty() )
+           *i = newn;
+       else
+           alt_names.erase(i);
+       }
+    else if( !newn.empty() )
        alt_names.push_back(newn);
     }
 

Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=38472&r1=38471&r2=38472&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Thu Jun 14 18:08:33 2007
@@ -4,6 +4,7 @@
 - use provided fstab options when mounting filesystems
 - implement support for user quota (fate#120106)
 - disable noauto option for crypted volumes (see fate #302001)
+- fix fs type detection for luks encrypted volumes 
 
 -------------------------------------------------------------------
 Wed Jun  6 13:56:50 CEST 2007 - fehr@xxxxxxx

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