Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41369 - in /branches/SuSE-SLE-10-SP1-Branch/storage: libstorage/src/Volume.cc package/yast2-storage.changes
  • From: fehr@xxxxxxxxxxxxxxxx
  • Date: Thu, 11 Oct 2007 11:33:19 -0000
  • Message-id: <20071011113320.22378352EC@xxxxxxxxxxxxxxxx>
Author: fehr
Date: Thu Oct 11 13:33:19 2007
New Revision: 41369

URL: http://svn.opensuse.org/viewcvs/yast?rev=41369&view=rev
Log:
- fix missing initialisation of tmpcrypt (#307219)
- fix case of nonzero passno for encrypted fstab entries (#307221)

Modified:
    branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc
    branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes

Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc?rev=41369&r1=41368&r2=41369&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc (original)
+++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Volume.cc Thu Oct 11 13:33:19 2007
@@ -1114,11 +1114,17 @@
 
 int Volume::resizeFs()
     {
+    SystemCmd c;
+    string cmd;
     int ret = 0;
+    if( encryption!=ENC_NONE && !dmcrypt_dev.empty() )
+       {
+       cmd = "cryptsetup resize ";
+       cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1);
+       c.execute( cmd );
+       }
     if( !format && !ignore_fs )
        {
-       string cmd;
-       SystemCmd c;
        switch( fs )
            {
            case SWAP:
@@ -2249,7 +2255,7 @@
                    {
                    changed = true;
                    che.fs = fs_names[fs];
-                   if( fs==SWAP )
+                   if( fs==SWAP || encryption!=ENC_NONE )
                        che.freq = che.passno = 0;
                    else
                        {
@@ -2264,6 +2270,13 @@
                    if( !dmcrypt() )
                        che.loop_dev = fstab_loop_dev;
                    che.dentry = de;
+                   if( encryption!=ENC_NONE )
+                       che.freq = che.passno = 0;
+                   else
+                       {
+                       che.freq = 1;
+                       che.passno = (mp=="/") ? 1 : 2;
+                       }
                    }
                if( changed )
                    {

Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes?rev=41369&r1=41368&r2=41369&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original)
+++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:33:19 2007
@@ -9,6 +9,8 @@
 - handle EVMS over md correctly in GetUsedEvmsDisks (#266538)
 - fixed crash during detection caused by empty key-value-pair (#278169)
 - improve discrimination between EFI and win partitions (#287289)
+- fix missing initialisation of tmpcrypt (#307219)
+- fix case of nonzero passno for encrypted fstab entries (#307221)
 
 -------------------------------------------------------------------
 Mon Oct  8 10:49:37 CEST 2007 - fehr@xxxxxxx

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

< Previous Next >
This Thread
  • No further messages