"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/ext2.cc" between
gparted-1.1.0.tar.gz and gparted-1.2.0.tar.gz

About: GParted is a graphical partition editor for creating, reorganizing, and deleting disk partitions (using GNU libparted).

ext2.cc  (gparted-1.1.0):ext2.cc  (gparted-1.2.0)
skipping to change at line 49 skipping to change at line 49
if ( ! Glib::find_program_in_path( mkfs_cmd ).empty() ) if ( ! Glib::find_program_in_path( mkfs_cmd ).empty() )
{ {
fs .create = FS::EXTERNAL ; fs .create = FS::EXTERNAL ;
fs .create_with_label = FS::EXTERNAL ; fs .create_with_label = FS::EXTERNAL ;
// Determine mkfs.ext4 version specific capabilities. // Determine mkfs.ext4 version specific capabilities.
force_auto_64bit = false; force_auto_64bit = false;
if ( specific_type == FS_EXT4 ) if ( specific_type == FS_EXT4 )
{ {
Utils::execute_command( mkfs_cmd + " -V", output, error, true ); Utils::execute_command( mkfs_cmd + " -V", output, error, true );
int mke4fs_major_ver = 0; int mke2fs_major_ver = 0;
int mke4fs_minor_ver = 0; int mke2fs_minor_ver = 0;
int mke4fs_patch_ver = 0; int mke2fs_patch_ver = 0;
if ( sscanf( error.c_str(), "mke%*[24]fs %d.%d.%d", if (sscanf(error.c_str(), "mke2fs %d.%d.%d",
&mke4fs_major_ver, &mke4fs_minor_ver, &mke4f &mke2fs_major_ver, &mke2fs_minor_ver, &mke2fs_
s_patch_ver ) >= 2 ) patch_ver) >= 2)
{ {
// Ext4 64bit feature was added in e2fsprogs 1.42 , but // Ext4 64bit feature was added in e2fsprogs 1.42 , but
// only enable large volumes from 1.42.9 when a l arge // only enable large volumes from 1.42.9 when a l arge
// number of 64bit bugs were fixed. // number of 64bit bugs were fixed.
// * Release notes, E2fsprogs 1.42 (November 29 , 2011) // * Release notes, E2fsprogs 1.42 (November 29 , 2011)
// http://e2fsprogs.sourceforge.net/e2fsprogs -release.html#1.42 // http://e2fsprogs.sourceforge.net/e2fsprogs -release.html#1.42
// * Release notes, E2fsprogs 1.42.9 (December 28, 2013) // * Release notes, E2fsprogs 1.42.9 (December 28, 2013)
// http://e2fsprogs.sourceforge.net/e2fsprogs -release.html#1.42.9 // http://e2fsprogs.sourceforge.net/e2fsprogs -release.html#1.42.9
have_64bit_feature = ( mke4fs_major_ver > 1 ) have_64bit_feature = (mke2fs_major_ver > 1)
|| ( mke4fs_major_ver == 1 & || (mke2fs_major_ver == 1 &&
& mke4fs_minor_ver > 42 ) mke2fs_minor_ver > 42)
|| ( mke4fs_major_ver == 1 & || (mke2fs_major_ver == 1 &&
& mke4fs_minor_ver == 42 && mke4fs_patch_ver >= 9 ); mke2fs_minor_ver == 42 && mke2fs_patch_ver >= 9);
// (#766910) E2fsprogs 1.43 creates 64bit ext4 fi le // (#766910) E2fsprogs 1.43 creates 64bit ext4 fi le
// systems by default. RHEL/CentOS 7 configured e2fsprogs // systems by default. RHEL/CentOS 7 configured e2fsprogs
// 1.42.9 to create 64bit ext4 file systems by de fault. // 1.42.9 to create 64bit ext4 file systems by de fault.
// Theoretically this can be done when 64bit feat ure was // Theoretically this can be done when 64bit feat ure was
// added in e2fsprogs 1.42. GParted will re-impl ement the // added in e2fsprogs 1.42. GParted will re-impl ement the
// removed mke2fs.conf(5) auto_64-bit_support opt ion to // removed mke2fs.conf(5) auto_64-bit_support opt ion to
// avoid the issues with multiple boot loaders no t working // avoid the issues with multiple boot loaders no t working
// with 64bit ext4 file systems. // with 64bit ext4 file systems.
force_auto_64bit = ( mke4fs_major_ver > 1 ) force_auto_64bit = (mke2fs_major_ver > 1)
|| ( mke4fs_major_ver == 1 && || (mke2fs_major_ver == 1 && m
mke4fs_minor_ver >= 42 ); ke2fs_minor_ver >= 42);
} }
} }
} }
if ( ! Glib::find_program_in_path( "dumpe2fs").empty() ) if ( ! Glib::find_program_in_path( "dumpe2fs").empty() )
{ {
// Resize2fs is preferred, but not required, to determine the min imum FS // Resize2fs is preferred, but not required, to determine the min imum FS
// size. Can fall back to using dumpe2fs instead. Dumpe2fs is r equired // size. Can fall back to using dumpe2fs instead. Dumpe2fs is r equired
// for reading FS size and FS block size. See ext2::set_used_sec tors() // for reading FS size and FS block size. See ext2::set_used_sec tors()
// implementation for details. // implementation for details.
 End of changes. 3 change blocks. 
14 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)