[PC-BSD Commits] r17327 - pcbsd/current/src-qt4/pc-mounttray

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-06-19 20:50:57 +0000 (Tue, 19 Jun 2012)
New Revision: 17327

Modified:
   pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp
   pcbsd/current/src-qt4/pc-mounttray/mountTray.h
Log:
Add ability for pc-mounttray to recognize and mount XFS and ReiserFS filesystems (Still needs testing - but should work as is)



Modified: pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp	2012-06-19 20:47:55 UTC (rev 17326)
+++ pcbsd/current/src-qt4/pc-mounttray/mountTray.cpp	2012-06-19 20:50:57 UTC (rev 17327)
@@ -128,8 +128,8 @@
   // - Find the filesystem type for the device
   QString filesys;
   QStringList fsdetect, fslabel;
-  fsdetect << "FAT" << "NTFS" << "EXT" << "ISO 9660" << "Unix Fast File system"; //string to match for a particular filesystem
-  fslabel << "FAT" << "NTFS" << "EXT" << "CD9660" << "UFS"; //internal labels for the filesystems
+  fsdetect << "FAT" << "NTFS" << "EXT" << "ISO 9660" << "Unix Fast File system" << "Reiser" << "XFS"; //string to match for a particular filesystem
+  fslabel << "FAT" << "NTFS" << "EXT" << "CD9660" << "UFS" << "REISERFS" << "XFS"; //internal labels for the filesystems
   for(int i=0; i<fsdetect.length(); i++){
     if(devFSsec.contains(fsdetect[i]) || devFSsec2.contains(fsdetect[i]) ){
       filesys = fslabel[i]; 
@@ -277,6 +277,8 @@
   else if(fstypedet == "EXT"){ fstype = "mount -t ext2fs"; }
   else if(fstypedet == "CD9660"){ fstype = "mount -t cd9660"; }
   else if(fstypedet == "UFS"){ fstype = "mount -t ufs"; }
+  else if(fstypedet == "REISERFS"){ fstype = "mount -t reiserfs"; }
+  else if(fstypedet == "XFS"){ fstype = "mount -t xfs"; }
   else{
     qDebug() << "Unknown device filesystem:" << dev << fstype;
     QMessageBox::warning(this,tr("Unknown Device Filesystem"),tr("The filesystem on this device is unknown and cannot be mounted at this time") );

Modified: pcbsd/current/src-qt4/pc-mounttray/mountTray.h
===================================================================
--- pcbsd/current/src-qt4/pc-mounttray/mountTray.h	2012-06-19 20:47:55 UTC (rev 17326)
+++ pcbsd/current/src-qt4/pc-mounttray/mountTray.h	2012-06-19 20:50:57 UTC (rev 17327)
@@ -30,8 +30,8 @@
   void newDevdMessage();
   void slotTrayActivated(QSystemTrayIcon::ActivationReason);
   void slotOpenMediaDir();
+  void autoMount(QAction*,bool onstartup);  
   
-  
 private:
   QString MOUNTDIR, DEVICEDIR, USERNAME, FILEMAN, AMFILE;
   QProcess *devdProc;
@@ -57,7 +57,6 @@
   void getDefaultFileManager();
   void loadAutoMountFile();
   void setAutoMount(QAction*, bool);
-  void autoMount(QAction*,bool onstartup);
   bool isAutoMountEnabled(QAction*);
   void setSubMenu(QAction*);
 };