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

Remove remaining use of retired vol_id 

Vol_id has been retired and removed from all supported distributions.
See earlier commit "Remove use of retired vol_id from FS_Info module
(#767842)" for more details.  Therefore remove it's use from GParted
entirely.
This commit is contained in:
Mike Fleetwood 2016-08-04 16:01:25 +01:00 committed by Curtis Gedak
parent 571304d2c6
commit 91e5a0960e
5 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -255,7 +255,6 @@ system. These commands include:
blkid - [mandatory requirement] used to detect file systems
libparted doesn't, read UUIDs and volume labels
hdparm - used to query disk device serial numbers
vol_id - used to read volume labels
udisks - used to prevent automounting of file systems
devkit-disks - used to prevent automounting of file systems
{filemanager} - used in attempt data rescue to display discovered

1
include/hfs.h
View File

@ -29,7 +29,6 @@ class hfs : public FileSystem
{
public:
FS get_filesystem_support() ;
void read_label( Partition & partition ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
};

1
include/hfsplus.h
View File

@ -29,7 +29,6 @@ class hfsplus : public FileSystem
{
public:
FS get_filesystem_support() ;
void read_label( Partition & partition ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ;
};

24
src/hfs.cc
View File

@ -42,9 +42,6 @@ FS hfs::get_filesystem_support()
if ( ! Glib::find_program_in_path( "hfsck" ) .empty() )
fs .check = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
fs .read_label = FS::EXTERNAL ;
fs .copy = GParted::FS::GPARTED ;
fs .move = GParted::FS::GPARTED ;
fs .online_read = FS::GPARTED ;
@ -54,27 +51,6 @@ FS hfs::get_filesystem_support()
return fs ;
}
void hfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
Glib::ustring label = Utils::regexp_label( output, "ID_FS_LABEL=([^\n]*)" ) ;
//FIXME: find a better way to see if label is empty.. imagine someone uses 'untitled' as label.... ;)
if ( label != "untitled" )
partition.set_filesystem_label( label );
else
partition.set_filesystem_label( "" );
}
else
{
if ( ! output .empty() )
partition.push_back_message( output );
if ( ! error .empty() )
partition.push_back_message( error );
}
}
bool hfs::create( const Partition & new_partition, OperationDetail & operationdetail )
{
Glib::ustring cmd = "";

24
src/hfsplus.cc
View File

@ -42,9 +42,6 @@ FS hfsplus::get_filesystem_support()
if ( ! Glib::find_program_in_path( "fsck.hfsplus" ) .empty() )
fs .check = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
fs .read_label = FS::EXTERNAL ;
fs .copy = GParted::FS::GPARTED ;
fs .move = GParted::FS::GPARTED ;
fs .online_read = FS::GPARTED ;
@ -52,27 +49,6 @@ FS hfsplus::get_filesystem_support()
return fs ;
}
void hfsplus::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
Glib::ustring label = Utils::regexp_label( output, "ID_FS_LABEL=([^\n]*)" ) ;
//FIXME: find a better way to see if label is empty.. imagine someone uses 'untitled' as label.... ;)
if ( label != "untitled" )
partition.set_filesystem_label( label );
else
partition.set_filesystem_label( "" );
}
else
{
if ( ! output .empty() )
partition.push_back_message( output );
if ( ! error .empty() )
partition.push_back_message( error );
}
}
bool hfsplus::create( const Partition & new_partition, OperationDetail & operationdetail )
{
Glib::ustring cmd = "";