gnome/gparted
gnome/gparted
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gparted synced 2024-08-27 11:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for e4fsprogs commands for ext4 support on RHEL/CentOS 5.x (#738706)

Browse source 
RHEL / CentOS 5.6 and later officially support ext4 file system [1].
From RHEL / CentOS 5.3 ext4 file system was included as a technology
preview.  Ext4 file system tools are in a separate package e4fsprogs,
using uniquely named commands.  The standard e2fsprogs commands only
support ext2 and ext3 file systems.

    # mkfs.ext4 /dev/sdb3
    # tune2fs -l /dev/sdb3
    tune2fs 1.39 (29-May-2006)
    tune2fs: Filesystem has unsupported feature(s) while trying to open /dev/sdb3
    Couldn't find valid filesystem superblock.
    # echo $?
    1
    # tune4fs -l /dev/sdb3
    tune4fs 1.41.12 (17-May-2010)
    Filesystem volume name:   <none>
    Last mounted on:          <not available>
    Filesystem UUID:          ba4a9d58-7728-4b47-8a90-80e772615637
    Filesystem magic number:  0xEF53
    Filesystem revision #:    1 (dynamic)
    Filesystem features:      has_journal ext_attr resize_inode dir_index filetype extent flex_bg sparse_super large_file huge_file uninit_bg dir_nlink extra_isize
    ...

For ext4 only, search for the e4fsprogs specific commands first and the
standard e2fsprogs commands second.

[1] RHEL 5.6 Release Notes, 5. Filesystems and Storage
https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/5/html/5.6_Release_Notes/ar01s05.html

Bug #738706 - GParted doesn't support ext4 on RHEL/CentOS 5.x
This commit is contained in:
Mike Fleetwood 2014-10-18 11:57:22 +01:00 committed by Curtis Gedak
parent ad6f73a5f6
commit f672f68863
2 changed files with 59 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/ext2.h
View file

@ -27,8 +27,16 @@ namespace GParted
class ext2 : public FileSystem class ext2 : public FileSystem
{ {
const enum FILESYSTEM specific_type; const enum FILESYSTEM specific_type;
Glib::ustring dump_cmd;
Glib::ustring fsck_cmd;
Glib::ustring image_cmd;
Glib::ustring label_cmd;
Glib::ustring mkfs_cmd;
Glib::ustring resize_cmd;
Glib::ustring tune_cmd;
public: public:
ext2( enum FILESYSTEM type ) : specific_type( type ) {}; ext2( enum FILESYSTEM type ) : specific_type( type ), dump_cmd( "" ), fsck_cmd( "" ), image_cmd( "" ),
label_cmd( "" ), mkfs_cmd( "" ), resize_cmd( "" ), tune_cmd( "" ) {};
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 ) ;

73
src/ext2.cc
View file

@ -27,32 +27,56 @@ FS ext2::get_filesystem_support()
fs .busy = FS::GPARTED ; fs .busy = FS::GPARTED ;
//Only enable any functionality if the relevant mkfs.extX command is // Only enable functionality if the relevant mkfs.extX command is found to ensure
// found to ensure that the version of e2fsprogs is new enough to // that the version of e2fsprogs is new enough to support ext4. Applying to
// support ext4. Applying to ext2/3 too is OK as relevant mkfs.ext2/3 // ext2/3 is OK as relevant mkfs.ext2/3 commands exist. Also for ext4 only, check
// commands exist. // for e4fsprogs commands to support RHEL/CentOS 5.x which uses a separate package
// to provide ext4 support. The existing e2fsprogs commands only support ext2/3.
if ( ! Glib::find_program_in_path( "mkfs." + Utils::get_filesystem_string( specific_type ) ).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 ;
if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "dumpe4fs" ).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 ( ! Glib::find_program_in_path( "tune2fs" ) .empty() ) { if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "tune4fs" ).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 ( ! Glib::find_program_in_path( "e2label" ) .empty() ) { if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4label" ).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 ( ! Glib::find_program_in_path( "e2fsck" ) .empty() ) if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4fsck" ).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 ( ! Glib::find_program_in_path( "resize2fs" ) .empty() && fs .check ) if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "resize4fs" ).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 ;
@ -68,9 +92,13 @@ 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 ( ! Glib::find_program_in_path( "e2image" ) .empty() ) if ( specific_type == FS_EXT4 && ! Glib::find_program_in_path( "e4image" ).empty() )
image_cmd = "e4image";
else if ( ! Glib::find_program_in_path( "e2image" ).empty() )
image_cmd = "e2image";
if ( image_cmd != "" )
{ {
Utils::execute_command( "e2image", output, error, true ) ; Utils::execute_command( image_cmd, 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 ;
} }
@ -93,7 +121,7 @@ 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( "dumpe2fs -h " + partition .get_path(), output, error, true ) ) if ( ! Utils::execute_command( dump_cmd + " -h " + partition .get_path(), output, error, true ) )
{ {
index = output .find( "Block count:" ) ; index = output .find( "Block count:" ) ;
if ( index >= output .length() || if ( index >= output .length() ||
@ -147,7 +175,7 @@ void ext2::set_used_sectors( Partition & partition )
void ext2::read_label( Partition & partition ) void ext2::read_label( Partition & partition )
{ {
if ( ! Utils::execute_command( "e2label " + partition .get_path(), output, error, true ) ) if ( ! Utils::execute_command( label_cmd + " " + partition .get_path(), output, error, true ) )
{ {
partition .set_label( Utils::trim( output ) ) ; partition .set_label( Utils::trim( output ) ) ;
} }
@ -163,12 +191,12 @@ 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( "e2label " + partition .get_path() + " \"" + partition .get_label() + "\"", operationdetail ) ; return ! execute_command( label_cmd + " " + partition .get_path() + " \"" + partition .get_label() + "\"", operationdetail ) ;
} }
void ext2::read_uuid( Partition & partition ) void ext2::read_uuid( Partition & partition )
{ {
if ( ! Utils::execute_command( "tune2fs -l " + partition .get_path(), output, error, true ) ) if ( ! Utils::execute_command( tune_cmd + " -l " + partition .get_path(), 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 ")" ) ;
} }
@ -184,13 +212,12 @@ 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( "tune2fs -U random " + partition .get_path(), operationdetail ) ; return ! execute_command( tune_cmd + " -U random " + partition .get_path(), operationdetail ) ;
} }
bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail ) bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail )
{ {
return ! execute_command( "mkfs." + Utils::get_filesystem_string( specific_type ) + return ! execute_command( mkfs_cmd + " -L \"" + new_partition.get_label() + "\" " + new_partition.get_path(),
" -L \"" + new_partition.get_label() + "\" " + new_partition.get_path(),
operationdetail, operationdetail,
false, false,
true ); true );
@ -198,7 +225,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 = "resize2fs -p " + partition_new .get_path() ; Glib::ustring str_temp = resize_cmd + " -p " + 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(
@ -209,7 +236,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( "e2fsck -f -y -v -C 0 " + partition.get_path(), operationdetail, exit_status = execute_command( fsck_cmd + " -f -y -v -C 0 " + partition.get_path(), operationdetail,
false, true ); false, true );
//exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED' //exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED'
@ -226,10 +253,10 @@ bool ext2::move( const Partition & partition_new,
distance = partition_old.sector_start - partition_new.sector_start; distance = partition_old.sector_start - partition_new.sector_start;
offset = Utils::num_to_str( llabs(distance) * partition_new.sector_size ); offset = Utils::num_to_str( llabs(distance) * partition_new.sector_size );
if ( distance < 0 ) if ( distance < 0 )
return ! execute_command( "e2image -ra -p -o " + offset + " " + partition_new.get_path(), return ! execute_command( image_cmd + " -ra -p -o " + offset + " " + partition_new.get_path(),
operationdetail, true, true ); operationdetail, true, true );
else else
return ! execute_command( "e2image -ra -p -O " + offset + " " + partition_new.get_path(), return ! execute_command( image_cmd + " -ra -p -O " + offset + " " + partition_new.get_path(),
operationdetail, true, true ); operationdetail, true, true );
} }
@ -238,7 +265,7 @@ bool ext2::copy( const Partition & src_part,
Partition & dest_part, Partition & dest_part,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{ {
return ! execute_command( "e2image -ra -p " + src_part.get_path() + " " + dest_part.get_path(), return ! execute_command( image_cmd + " -ra -p " + src_part.get_path() + " " + dest_part.get_path(),
operationdetail, true, true ); operationdetail, true, true );
} }