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

Add detection of iso9660 file system (#771244) 

Requires blkid.

Note that FS_LUKS was also moved to more closely match the order in
include/Utils.h

Bug 771244 - gparted does not recognize the iso9660 file system in
             cloned Ubuntu USB boot drives
This commit is contained in:
Curtis Gedak 2016-10-06 12:49:49 -06:00
parent e4819fdd45
commit f762c0cc34
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Utils.h
View File

@ -91,14 +91,15 @@ enum FILESYSTEM
// Recognised signatures but otherwise unsupported file system types
FS_BITLOCKER = 25,
FS_GRUB2_CORE_IMG = 26,
FS_LINUX_SWRAID = 27,
FS_LINUX_SWSUSPEND = 28,
FS_REFS = 29,
FS_ZFS = 30,
FS_ISO9660 = 27,
FS_LINUX_SWRAID = 28,
FS_LINUX_SWSUSPEND = 29,
FS_REFS = 30,
FS_ZFS = 31,
// Partition space usage colours
FS_USED = 31,
FS_UNUSED = 32
FS_USED = 32,
FS_UNUSED = 33
} ;
enum SIZE_UNIT

2
src/GParted_Core.cc
View File

@ -1471,6 +1471,8 @@ FILESYSTEM GParted_Core::detect_filesystem( PedDevice * lp_device, PedPartition
return GParted::FS_HFSPLUS ;
else if ( fsname == "ufs" )
return GParted::FS_UFS ;
else if ( fsname == "iso9660" )
return FS_ISO9660;
else if ( fsname == "linux_raid_member" )
return FS_LINUX_SWRAID ;
else if ( fsname == "swsusp" ||

6
src/Utils.cc
View File

@ -98,6 +98,7 @@ Glib::ustring Utils::get_color( FILESYSTEM filesystem )
case FS_EXT3 : return "#7590AE" ; //blue medium
case FS_EXT4 : return "#4B6983" ; //blue dark
case FS_LINUX_SWAP : return "#C1665A" ; //red medium
case FS_LUKS : return "#625B81" ; //purple dark
case FS_F2FS : return "#DF421E" ; //accent red
case FS_FAT16 : return "#00FF00" ; //green
case FS_FAT32 : return "#18D918" ; // ~ medium green
@ -116,7 +117,7 @@ Glib::ustring Utils::get_color( FILESYSTEM filesystem )
case FS_LVM2_PV : return "#B39169" ; //face skin dark
case FS_BITLOCKER : return "#494066" ; //purple shadow
case FS_GRUB2_CORE_IMG : return "#666666" ; //~ dark gray
case FS_LUKS : return "#625B81" ; //purple dark
case FS_ISO9660 : return "#D3D3D3" ; // ~ light gray
case FS_LINUX_SWRAID : return "#5A4733" ; // ~ dark brown
case FS_LINUX_SWSUSPEND : return "#884631" ; //red dark
case FS_REFS : return "#2AB98A" ; // ~ medium aquamarine
@ -275,6 +276,7 @@ Glib::ustring Utils::get_filesystem_string( FILESYSTEM filesystem )
case FS_EXT3 : return "ext3" ;
case FS_EXT4 : return "ext4" ;
case FS_LINUX_SWAP : return "linux-swap" ;
case FS_LUKS : return "luks";
case FS_F2FS : return "f2fs" ;
case FS_FAT16 : return "fat16" ;
case FS_FAT32 : return "fat32" ;
@ -293,7 +295,7 @@ Glib::ustring Utils::get_filesystem_string( FILESYSTEM filesystem )
case FS_LVM2_PV : return "lvm2 pv" ;
case FS_BITLOCKER : return "bitlocker" ;
case FS_GRUB2_CORE_IMG : return "grub2 core.img";
case FS_LUKS : return "luks";
case FS_ISO9660 : return "iso9660";
case FS_LINUX_SWRAID : return "linux-raid" ;
case FS_LINUX_SWSUSPEND : return "linux-suspend" ;
case FS_REFS : return "refs" ;