[gparted] Add detection of iso9660 file system (#771244)



commit f762c0cc34f5d414bce6b29179bd7487baa33a10
Author: Curtis Gedak <gedakc gmail com>
Date:   Thu Oct 6 12:49:49 2016 -0600

    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

 include/Utils.h     |   13 +++++++------
 src/GParted_Core.cc |    2 ++
 src/Utils.cc        |    6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/include/Utils.h b/include/Utils.h
index 127b0d1..02271ef 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -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
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 2bc1686..46bcda3 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -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"    ||
diff --git a/src/Utils.cc b/src/Utils.cc
index 23b9a38..b31ecdf 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -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" ;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]