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

reverted back to parted probing after i heard patches to fix some issues 

* src/GParted_Core.cc: reverted back to parted probing after i heard
  patches to fix some issues with it are underway. (skipping of floppy
  and cdrom)
* src/reiser4.cc,
  src/reiserfs.cc: added --quiet to the fschecks to prevent the
  detailswindow from dying under the load. I should find a solution
  for that anyway.
This commit is contained in:
Bart Hakvoort 2006-09-11 09:09:19 +00:00
parent 50a32c3e14
commit 55851c6c46
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-09-11 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: reverted back to parted probing after i heard
patches to fix some issues with it are underway. (skipping of floppy
and cdrom)
* src/reiser4.cc,
src/reiserfs.cc: added --quiet to the fschecks to prevent the
detailswindow from dying under the load. I should find a solution
for that anyway.
2006-09-10 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: display total sector info in copy_filesystem()

25
src/GParted_Core.cc
View File

@ -151,27 +151,22 @@ void GParted_Core::set_devices( std::vector<Device> & devices )
device_paths .clear() ;
//try to find all available devices
std::ifstream proc_partitions( "/proc/partitions" ) ;
if ( proc_partitions )
{
std::string line ;
while ( getline( proc_partitions, line ) )
{
int minor ;
char device[512] ;
if ( sscanf( line .c_str(), "%*d %d %*d %s", &minor, device ) == 2 && minor == 0 )
device_paths .push_back( "/dev/" + Glib::ustring( device ) ) ;
}
proc_partitions .close() ;
}
ped_device_probe_all();
lp_device = ped_device_get_next( NULL );
while ( lp_device )
{
device_paths .push_back( lp_device ->path ) ;
lp_device = ped_device_get_next( lp_device ) ;
}
close_device_and_disk() ;
std::sort( device_paths .begin(), device_paths .end() ) ;
}
for ( unsigned int t = 0 ; t < device_paths .size() ; t++ )
{
if ( open_device_and_disk( device_paths[ t ], false ) )
if ( device_paths[ t ] .length() > 6 && device_paths[ t ] .is_ascii() && open_device_and_disk( device_paths[ t ], false ) )
{
temp_device .Reset() ;

2
src/reiser4.cc
View File

@ -96,7 +96,7 @@ bool reiser4::copy( const Glib::ustring & src_part_path,
bool reiser4::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "fsck.reiser4 --yes --fix " + partition .get_path(), operationdetail ) ;
return ! execute_command( "fsck.reiser4 --yes --fix --quiet " + partition .get_path(), operationdetail ) ;
}
} //GParted

2
src/reiserfs.cc
View File

@ -112,7 +112,7 @@ bool reiserfs::copy( const Glib::ustring & src_part_path,
bool reiserfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
{
exit_status = execute_command( "reiserfsck --y --fix-fixable " + partition .get_path(), operationdetail ) ;
exit_status = execute_command( "reiserfsck --yes --fix-fixable --quiet " + partition .get_path(), operationdetail ) ;
return ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) ;
}