[gparted] Implement check operation on encrypted file systems (#774818)



commit df05a9785fa9754fa563d2c761891d0bad73e991
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Fri Sep 9 10:05:32 2016 +0100

    Implement check operation on encrypted file systems (#774818)
    
    Just update the code describing and implementing the check operation.
    No need to update the code composing the operation in
    Win_GParted::activate_check() as that is incredibly simple, just cloning
    the Partition object and doesn't need changing.
    
    Note that for encrypted file systems this does:
    1) runs FSCK on the encrypted file system;
    2) grows the file system to fill the encrypted mapping.
    At this time it does not grow the encryption mapping to fill the
    partition.  That will be added after resize/move has been implemented.
    
    Bug 774818 - Implement LUKS read-write actions NOT requiring a
                 passphrase

 src/GParted_Core.cc   |    4 ++--
 src/OperationCheck.cc |    2 +-
 src/Win_GParted.cc    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index cbc8121..9c165ef 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -592,9 +592,9 @@ bool GParted_Core::apply_operation_to_disk( Operation * operation )
                case OPERATION_CHECK:
                        success =    calibrate_partition( operation->get_partition_original(),
                                                          operation->operation_detail )
-                                 && check_repair_filesystem( operation->get_partition_original(),
+                                 && check_repair_filesystem( 
operation->get_partition_original().get_filesystem_partition(),
                                                              operation->operation_detail )
-                                 && maximize_filesystem( operation->get_partition_original(),
+                                 && maximize_filesystem( 
operation->get_partition_original().get_filesystem_partition(),
                                                          operation->operation_detail );
                        break;
 
diff --git a/src/OperationCheck.cc b/src/OperationCheck.cc
index b92aa77..74b73f7 100644
--- a/src/OperationCheck.cc
+++ b/src/OperationCheck.cc
@@ -48,7 +48,7 @@ void OperationCheck::create_description()
 
        /*TO TRANSLATORS: looks like  Check and repair file system (ext3) on /dev/hda4 */
        description = String::ucompose( _("Check and repair file system (%1) on %2"),
-                                       Utils::get_filesystem_string( partition_original->filesystem ),
+                                       partition_original->get_filesystem_string(),
                                        partition_original->get_path() );
 }
 
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 3f0ba22..d166e7b 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -1275,7 +1275,7 @@ void Win_GParted::set_valid_operations()
                        allow_paste( true );
 
                //see if we can somehow check/repair this file system....
-               if ( fs.check && selected_partition_ptr->status == STAT_REAL )
+               if ( selected_partition_ptr->status == STAT_REAL && fs_cap.check )
                        allow_check( true ) ;
        }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]