Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove checks for e4fsprogs commands (#794253) 

PATCHSET OVERVIEW:

As of 31 March 2017 RHEL / CentOS 5 reached the end of their support
[1][2].  Therefore remove code which supports them.  This makes RHEL /
CentOS 6 the oldest supported distribution.  So the minimum required
versions of glibmm and gtkmm can be increased dropping some autoconf
checks and conditional code supporting older versions of these
libraries.  This will undo the bulk of these these previous bug fixes:

* GParted 0.21.0
  Bug 738706 - Add support for ext4 on RHEL/CentOS 5.x

* GParted 0.16.1
  Bug 695279 - Fix GParted doesn't compile on RHEL / CentOS 5.9

[1] Red Hat Enterprise Linux Life Cycle
    https://access.redhat.com/support/policy/updates/errata#Life_Cycle_Dates

[2] Subject: CentOS Linux 5 EOL
    https://lists.centos.org/pipermail/centos-announce/2017-April/022350.html

THIS PATCH:

Remove checks for e4fsprogs commands, removing support for ext4 on
RHEL / CentOS 5.x.  This is reverting earlier commit:
    f672f68863
    Check for e4fsprogs commands for ext4 support on RHEL/CentOS 5.x (#738706)

Mkfs_cmd member variable is being kept as a convenience so that it is
created once rather than on each use.  Also note that as it is a
Glib::ustring type object, it's constructor will be called which will
initialise it to the empty string so it doesn't need initialising to the
empty string in the initialiser list of the ext2() constructor itself.

Bug 794253 - Desupport RHEL / CentOS 5 and raise minimum required
             versions to glibmm 2.14.0 and gtkmm 2.16.0
This commit is contained in:
Mike Fleetwood 2018-03-08 11:00:47 +00:00 committed by Curtis Gedak
parent e6f8d6f32e
commit 6c4ab5dc28
2 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/ext2.h
View File

@ -32,17 +32,10 @@ namespace GParted
class ext2 : public FileSystem class ext2 : public FileSystem
{ {
const enum FSType specific_type; const enum FSType specific_type;
Glib::ustring dump_cmd;
Glib::ustring fsck_cmd;
Glib::ustring image_cmd;
Glib::ustring label_cmd;
Glib::ustring mkfs_cmd; Glib::ustring mkfs_cmd;
Glib::ustring resize_cmd;
Glib::ustring tune_cmd;
public: public:
ext2( enum FSType type ) : specific_type( type ), dump_cmd( "" ), fsck_cmd( "" ), image_cmd( "" ), ext2( enum FSType type ) : specific_type( type ), force_auto_64bit( false ) {};
label_cmd( "" ), mkfs_cmd( "" ), resize_cmd( "" ), tune_cmd( "" ),
force_auto_64bit( false ) {};
FS get_filesystem_support() ; FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ; void set_used_sectors( Partition & partition ) ;
void read_label( Partition & partition ) ; void read_label( Partition & partition ) ;

72
src/ext2.cc
View File

@ -34,12 +34,10 @@ FS ext2::get_filesystem_support()
// Only enable functionality if the relevant mkfs.extX command is found to ensure // Only enable functionality if the relevant mkfs.extX command is found to ensure
// that the version of e2fsprogs is new enough to support ext4. Applying to // that the version of e2fsprogs is new enough to support ext4. Applying to
// ext2/3 is OK as relevant mkfs.ext2/3 commands exist. Also for ext4 only, check // ext2/3 is OK as relevant mkfs.ext2/3 commands exist.
// for e4fsprogs commands to support RHEL/CentOS 5.x which uses a separate package mkfs_cmd = "mkfs." + Utils::get_filesystem_string( specific_type );
// to provide ext4 support. The existing e2fsprogs commands only support ext2/3. if ( ! Glib::find_program_in_path( mkfs_cmd ).empty() )
if ( ! Glib::find_program_in_path( "mkfs." + Utils::get_filesystem_string( specific_type ) ).empty() )
{ {
mkfs_cmd = "mkfs." + Utils::get_filesystem_string( specific_type );
fs .create = FS::EXTERNAL ; fs .create = FS::EXTERNAL ;
fs .create_with_label = FS::EXTERNAL ; fs .create_with_label = FS::EXTERNAL ;
@ -79,45 +77,25 @@ FS ext2::get_filesystem_support()
} }
} }
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "dumpe4fs" ).empty() ) if ( ! Glib::find_program_in_path( "dumpe2fs").empty() )
dump_cmd = "dumpe4fs";
else if ( ! Glib::find_program_in_path( "dumpe2fs" ).empty() )
dump_cmd = "dumpe2fs";
if ( dump_cmd != "" )
fs .read = FS::EXTERNAL ; fs .read = FS::EXTERNAL ;
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "tune4fs" ).empty() ) if ( ! Glib::find_program_in_path( "tune2fs" ).empty() )
tune_cmd = "tune4fs";
else if ( ! Glib::find_program_in_path( "tune2fs" ).empty() )
tune_cmd = "tune2fs";
if ( tune_cmd != "" )
{ {
fs .read_uuid = FS::EXTERNAL ; fs .read_uuid = FS::EXTERNAL ;
fs .write_uuid = FS::EXTERNAL ; fs .write_uuid = FS::EXTERNAL ;
} }
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4label" ).empty() ) if ( ! Glib::find_program_in_path( "e2label" ).empty() )
label_cmd = "e4label";
else if ( ! Glib::find_program_in_path( "e2label" ).empty() )
label_cmd = "e2label";
if ( label_cmd != "" )
{ {
fs .read_label = FS::EXTERNAL ; fs .read_label = FS::EXTERNAL ;
fs .write_label = FS::EXTERNAL ; fs .write_label = FS::EXTERNAL ;
} }
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4fsck" ).empty() ) if ( ! Glib::find_program_in_path( "e2fsck" ).empty() )
fsck_cmd = "e4fsck";
else if ( ! Glib::find_program_in_path( "e2fsck" ).empty() )
fsck_cmd = "e2fsck";
if ( fsck_cmd != "" )
fs .check = FS::EXTERNAL ; fs .check = FS::EXTERNAL ;
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "resize4fs" ).empty() ) if ( ! Glib::find_program_in_path( "resize2fs" ).empty() )
resize_cmd = "resize4fs";
else if ( ! Glib::find_program_in_path( "resize2fs" ).empty() )
resize_cmd = "resize2fs";
if ( resize_cmd != "" && fs .check )
{ {
fs .grow = FS::EXTERNAL ; fs .grow = FS::EXTERNAL ;
@ -133,13 +111,9 @@ FS ext2::get_filesystem_support()
// only copies used blocks, skipping unused blocks. This is more // only copies used blocks, skipping unused blocks. This is more
// efficient than copying all blocks used by GParted's internal // efficient than copying all blocks used by GParted's internal
// method. // method.
if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4image" ).empty() ) if ( ! Glib::find_program_in_path( "e2image" ).empty() )
image_cmd = "e4image";
else if ( ! Glib::find_program_in_path( "e2image" ).empty() )
image_cmd = "e2image";
if ( image_cmd != "" )
{ {
Utils::execute_command( image_cmd, output, error, true ) ; Utils::execute_command( "e2image", output, error, true ) ;
if ( Utils::regexp_label( error, "(-o src_offset)" ) == "-o src_offset" ) if ( Utils::regexp_label( error, "(-o src_offset)" ) == "-o src_offset" )
fs.copy = fs.move = FS::EXTERNAL ; fs.copy = fs.move = FS::EXTERNAL ;
} }
@ -175,8 +149,8 @@ void ext2::set_used_sectors( Partition & partition )
// avoid overhead subtraction. Read the free space from the kernel via // avoid overhead subtraction. Read the free space from the kernel via
// the statvfs() system call when mounted and from the superblock when // the statvfs() system call when mounted and from the superblock when
// unmounted. // unmounted.
if ( ! Utils::execute_command( dump_cmd + " -h " + Glib::shell_quote( partition.get_path() ), if ( ! Utils::execute_command( "dumpe2fs -h " + Glib::shell_quote( partition.get_path() ),
output, error, true ) ) output, error, true ) )
{ {
Glib::ustring::size_type index = output.find( "Block count:" ); Glib::ustring::size_type index = output.find( "Block count:" );
if ( index >= output .length() || if ( index >= output .length() ||
@ -233,8 +207,8 @@ void ext2::set_used_sectors( Partition & partition )
void ext2::read_label( Partition & partition ) void ext2::read_label( Partition & partition )
{ {
if ( ! Utils::execute_command( label_cmd + " " + Glib::shell_quote( partition.get_path() ), if ( ! Utils::execute_command( "e2label " + Glib::shell_quote( partition.get_path() ),
output, error, true ) ) output, error, true ) )
{ {
partition.set_filesystem_label( Utils::trim( output ) ); partition.set_filesystem_label( Utils::trim( output ) );
} }
@ -250,15 +224,15 @@ void ext2::read_label( Partition & partition )
bool ext2::write_label( const Partition & partition, OperationDetail & operationdetail ) bool ext2::write_label( const Partition & partition, OperationDetail & operationdetail )
{ {
return ! execute_command( label_cmd + " " + Glib::shell_quote( partition.get_path() ) + return ! execute_command( "e2label " + Glib::shell_quote( partition.get_path() ) +
" " + Glib::shell_quote( partition.get_filesystem_label() ), " " + Glib::shell_quote( partition.get_filesystem_label() ),
operationdetail, EXEC_CHECK_STATUS ); operationdetail, EXEC_CHECK_STATUS );
} }
void ext2::read_uuid( Partition & partition ) void ext2::read_uuid( Partition & partition )
{ {
if ( ! Utils::execute_command( tune_cmd + " -l " + Glib::shell_quote( partition.get_path() ), if ( ! Utils::execute_command( "tune2fs -l " + Glib::shell_quote( partition.get_path() ),
output, error, true ) ) output, error, true ) )
{ {
partition .uuid = Utils::regexp_label( output, "^Filesystem UUID:[[:blank:]]*(" RFC4122_NONE_NIL_UUID_REGEXP ")" ) ; partition .uuid = Utils::regexp_label( output, "^Filesystem UUID:[[:blank:]]*(" RFC4122_NONE_NIL_UUID_REGEXP ")" ) ;
} }
@ -274,7 +248,7 @@ void ext2::read_uuid( Partition & partition )
bool ext2::write_uuid( const Partition & partition, OperationDetail & operationdetail ) bool ext2::write_uuid( const Partition & partition, OperationDetail & operationdetail )
{ {
return ! execute_command( tune_cmd + " -U random " + Glib::shell_quote( partition.get_path() ), return ! execute_command( "tune2fs -U random " + Glib::shell_quote( partition.get_path() ),
operationdetail, EXEC_CHECK_STATUS ); operationdetail, EXEC_CHECK_STATUS );
} }
@ -300,7 +274,7 @@ bool ext2::create( const Partition & new_partition, OperationDetail & operationd
bool ext2::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition ) bool ext2::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
{ {
Glib::ustring str_temp = resize_cmd + " -p " + Glib::shell_quote( partition_new.get_path() ); Glib::ustring str_temp = "resize2fs -p " + Glib::shell_quote( partition_new.get_path() );
if ( ! fill_partition ) if ( ! fill_partition )
str_temp += " " + Utils::num_to_str( floor( Utils::sector_to_unit( str_temp += " " + Utils::num_to_str( floor( Utils::sector_to_unit(
@ -312,7 +286,7 @@ bool ext2::resize( const Partition & partition_new, OperationDetail & operationd
bool ext2::check_repair( const Partition & partition, OperationDetail & operationdetail ) bool ext2::check_repair( const Partition & partition, OperationDetail & operationdetail )
{ {
exit_status = execute_command( fsck_cmd + " -f -y -v -C 0 " + Glib::shell_quote( partition.get_path() ), exit_status = execute_command( "e2fsck -f -y -v -C 0 " + Glib::shell_quote( partition.get_path() ),
operationdetail, EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDOUT, operationdetail, EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDOUT,
static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::check_repair_progress ) ) ); static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::check_repair_progress ) ) );
bool success = ( exit_status == 0 || exit_status == 1 || exit_status == 2 ); bool success = ( exit_status == 0 || exit_status == 1 || exit_status == 2 );
@ -328,9 +302,9 @@ bool ext2::move( const Partition & partition_new,
Glib::ustring offset = Utils::num_to_str( llabs(distance) * partition_new.sector_size ); Glib::ustring offset = Utils::num_to_str( llabs(distance) * partition_new.sector_size );
Glib::ustring cmd; Glib::ustring cmd;
if ( distance < 0 ) if ( distance < 0 )
cmd = image_cmd + " -ra -p -o " + offset + " " + Glib::shell_quote( partition_new.get_path() ); cmd = "e2image -ra -p -o " + offset + " " + Glib::shell_quote( partition_new.get_path() );
else else
cmd = image_cmd + " -ra -p -O " + offset + " " + Glib::shell_quote( partition_new.get_path() ); cmd = "e2image -ra -p -O " + offset + " " + Glib::shell_quote( partition_new.get_path() );
fs_block_size = partition_old.fs_block_size; fs_block_size = partition_old.fs_block_size;
return ! execute_command( cmd, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR, return ! execute_command( cmd, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR,
@ -342,7 +316,7 @@ bool ext2::copy( const Partition & src_part,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{ {
fs_block_size = src_part.fs_block_size; fs_block_size = src_part.fs_block_size;
return ! execute_command( image_cmd + " -ra -p " + Glib::shell_quote( src_part.get_path() ) + return ! execute_command( "e2image -ra -p " + Glib::shell_quote( src_part.get_path() ) +
" " + Glib::shell_quote( dest_part.get_path() ), " " + Glib::shell_quote( dest_part.get_path() ),
operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR, operationdetail, EXEC_CHECK_STATUS|EXEC_CANCEL_SAFE|EXEC_PROGRESS_STDERR,
static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::copy_progress ) ) ); static_cast<StreamSlot>( sigc::mem_fun( *this, &ext2::copy_progress ) ) );