Changeset 67bf73c


Ignore:
Timestamp:
03/31/14 08:17:35 (4 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2
Children:
1cafdcc
Parents:
04f255e
Message:

Oops, accidentally included the HFS filesystem detection/usage in the last commit. HFS support does not work at this time, so remove that again for now.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/devCheck.cpp

    ra750011 r67bf73c  
    1515  fsMatch.clear(); 
    1616  fsFilter.clear(); 
    17   fsDetection << "FAT" << "NTFS" << "EXT" << "ISO 9660" << "Unix Fast File system" << "Reiser" << "XFS" << "HFS"; //string to find in "file -s" output 
    18   dsDetection << "FAT" << "NTFS" << "EXT" << "ISO9660" << "UFS" << "Reiser" << "XFS" << "UDF" << "HFS"; //string to find in "diskinfo" output 
    19   fsMatch << "FAT" << "NTFS" << "EXT" << "CD9660" << "UFS" << "REISERFS" << "XFS" << "UDF" << "HFS"; //internal labels for the filesystems 
    20   fsFilter << "fat" << "ntfs" << "ext" << "cdrom" << "ufs" << "reiser" << "xfs" << "udf" << "hfs"; //label categories in /dev/ 
     17  fsDetection << "FAT" << "NTFS" << "EXT" << "ISO 9660" << "Unix Fast File system" << "Reiser" << "XFS"; //string to find in "file -s" output 
     18  dsDetection << "FAT" << "NTFS" << "EXT" << "ISO9660" << "UFS" << "Reiser" << "XFS" << "UDF"; //string to find in "diskinfo" output 
     19  fsMatch << "FAT" << "NTFS" << "EXT" << "CD9660" << "UFS" << "REISERFS" << "XFS" << "UDF"; //internal labels for the filesystems 
     20  fsFilter << "fat" << "ntfs" << "ext" << "cdrom" << "ufs" << "reiser" << "xfs" << "udf"; //label categories in /dev/ 
    2121  //Initialize lists of Manual Filesystems that might be available 
    2222  fsManual.clear(); fsCMD.clear(); fsBinCheck.clear(); 
    23   fsManual << "FAT"  << "EXFAT" << "NTFS" << "EXT" << "EXT4" << "CD9660" << "UFS" << "REISERFS" << "XFS" << "UDF" << "HFS"; 
     23  fsManual << "FAT"  << "EXFAT" << "NTFS" << "EXT" << "EXT4" << "CD9660" << "UFS" << "REISERFS" << "XFS" << "UDF"; 
    2424  //fsCMD: %1 becomes device path, %2 becomes mointpoint path 
    2525  QString langCode = QString(getenv("LANG")); 
     
    3838  fsCMD << "mount -t xfs %1 %2"; //XFS 
    3939  fsCMD << "mount -t udf %1 %2"; //UDF 
    40   fsCMD << "hmount %1 %2"; //HFS 
    4140  fsBinCheck << "/sbin/mount_msdosfs" << "/usr/local/bin/mount.exfat-fuse" << "/usr/local/bin/ntfs-3g" << "/sbin/mount" \ 
    42                 << "/usr/local/bin/ext4fuse" << "/sbin/mount_cd9660" << "/sbin/mount" << "/sbin/mount" << "/sbin/mount" << "/sbin/mount_udf" \ 
    43                 << "/usr/local/bin/hmount"; 
     41                << "/usr/local/bin/ext4fuse" << "/sbin/mount_cd9660" << "/sbin/mount" << "/sbin/mount" << "/sbin/mount" << "/sbin/mount_udf"; 
    4442  //Initialize the device directory 
    4543  devDir = QDir(DEVICEDIR); 
Note: See TracChangeset for help on using the changeset viewer.