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

Rename FS_LVM2 -> FS_LVM2_PV (#160787) 

This is the first step of adding support for just LVM2 Phyiscal Volumes,
a subset of full LVM2 support.

Make it clear that it is only LVM2 PVs being treated like a file system.

Bug #160787 - lvm support
This commit is contained in:
Mike Fleetwood 2012-01-28 11:23:21 +00:00 committed by Curtis Gedak
parent d852a394e9
commit 391e5e12f9
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Utils.h
View File

@ -72,11 +72,11 @@ enum FILESYSTEM
FS_HFSPLUS = 18,
FS_UFS = 19,
FS_NILFS2 = 20,
FS_LVM2_PV = 21,
FS_USED = 21,
FS_UNUSED = 22,
FS_USED = 22,
FS_UNUSED = 23,
FS_LVM2 = 23,
FS_LUKS = 24
} ;

4
src/DialogFeatures.cc
View File

@ -125,8 +125,8 @@ void DialogFeatures::load_filesystems( const std::vector<FS> & FILESYSTEMS )
{
//Skip luks, lvm2, and unknown because these are not file systems
if (
FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS ||
FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2 ||
FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS ||
FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2_PV ||
FILESYSTEMS[ t ] .filesystem == GParted::FS_UNKNOWN
)
continue ;

2
src/Dialog_Partition_New.cc
View File

@ -49,7 +49,7 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
for ( unsigned int t = this ->FILESYSTEMS .size( ) ; t > 0 ; t-- )
{
if ( this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_UNKNOWN ||
this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2 ||
this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2_PV ||
this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS
)
this ->FILESYSTEMS .erase( this->FILESYSTEMS .begin() + t ) ;

10
src/GParted_Core.cc
View File

@ -146,7 +146,7 @@ void GParted_Core::find_supported_filesystems()
FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ;
//lvm2 physical volume -- not a file system
fs_notsupp .filesystem = GParted::FS_LVM2 ;
fs_notsupp .filesystem = GParted::FS_LVM2_PV ;
FILESYSTEMS .push_back( fs_notsupp ) ;
//luks encryption-- not a file system
@ -1197,7 +1197,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
temp = _( "Logical Volume Management is not yet supported." ) ;
temp += "\n" ;
partition_temp .messages .push_back( temp ) ;
return GParted::FS_LVM2 ;
return GParted::FS_LVM2_PV ;
}
}
@ -1344,7 +1344,7 @@ void GParted_Core::set_mountpoints( std::vector<Partition> & partitions )
partitions[ t ] .type == GParted::TYPE_LOGICAL
) &&
partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP &&
partitions[ t ] .filesystem != GParted::FS_LVM2 &&
partitions[ t ] .filesystem != GParted::FS_LVM2_PV &&
partitions[ t ] .filesystem != GParted::FS_LUKS
)
{
@ -1411,8 +1411,8 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions )
for ( unsigned int t = 0 ; t < partitions .size() ; t++ )
{
if ( partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP &&
partitions[ t ] .filesystem != GParted::FS_LUKS &&
partitions[ t ] .filesystem != GParted::FS_LVM2 &&
partitions[ t ] .filesystem != GParted::FS_LUKS &&
partitions[ t ] .filesystem != GParted::FS_LVM2_PV &&
partitions[ t ] .filesystem != GParted::FS_UNKNOWN
)
{

4
src/Utils.cc
View File

@ -93,7 +93,7 @@ Glib::ustring Utils::get_color( FILESYSTEM filesystem )
case FS_UFS : return "#D1940C" ; //accent yellow dark
case FS_USED : return "#F8F8BA" ; // ~ light tan yellow
case FS_UNUSED : return "#FFFFFF" ; //white
case FS_LVM2 : return "#CC9966" ; // ~ medium brown
case FS_LVM2_PV : return "#CC9966" ; // ~ medium brown
case FS_LUKS : return "#625B81" ; //purple dark
default : return "#000000" ;
@ -160,7 +160,7 @@ Glib::ustring Utils::get_filesystem_string( FILESYSTEM filesystem )
case FS_UFS : return "ufs" ;
case FS_USED : return _("used") ;
case FS_UNUSED : return _("unused") ;
case FS_LVM2 : return "lvm2" ;
case FS_LVM2_PV : return "lvm2" ;
case FS_LUKS : return "crypt-luks" ;
default : return "" ;

4
src/Win_GParted.cc
View File

@ -407,8 +407,8 @@ Gtk::Menu * Win_GParted::create_format_menu()
{
//Skip luks, lvm2, and unknown because these are not file systems
if (
gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LUKS ||
gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LVM2 ||
gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LUKS ||
gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LVM2_PV ||
gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_UNKNOWN
)
continue ;