Changeset 9fcc85a


Ignore:
Timestamp:
Aug 21, 2013 7:22:15 AM (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
efffa15
Parents:
dadf169 (diff), f9da465 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-qt4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/LPBackend.cpp

    r96c5e841 rf9da465  
    344344  QStringList list; 
    345345  for(int i=0; i<out.length(); i++){ 
    346     if(out[i].startsWith("/dev/da") && out[i].contains("(msdosfs,local)")){ 
     346      if(out[i].startsWith("/dev/da") && out[i].contains("(msdosfs,")){ 
    347347      QString mountpoint = out[i].section(" on ",1,1).section("(",0,0).simplified(); 
    348348      QString devnode = out[i].section(" on ",0,0).section("/",-1).simplified(); 
     
    354354 
    355355bool LPBackend::copySSHKey(QString mountPath, QString localHost){ 
    356   QString publicKey = "/root/.ssh/id_rsa.pub"; 
     356  QString publicKey = "/root/.ssh/id_rsa"; 
    357357  //copy the file onto the designated USB stick 
    358358  if(!mountPath.endsWith("/")){ mountPath.append("/"); } 
    359   mountPath.append("root/.ssh/"+localHost+"-id_rsa.pub"); 
     359  QDir lDir=mountPath + "lpreserver"; 
     360  if ( ! lDir.exists() ) 
     361     lDir.mkdir(lDir.path()); 
     362 
     363  mountPath.append("lpreserver/"+localHost+"-id_rsa"); 
     364 
    360365  bool ok = QFile::copy(publicKey, mountPath); 
    361366  return ok; 
  • src-qt4/pc-mounttray/menuItem.cpp

    r03aedf0 rdadf169  
    187187  QString fstype; 
    188188  QString fsopts=""; 
    189   if( filesystem == "FAT" ){ fstype = "mount -t msdosfs"; fsopts = "-o large,-m=644,-M=777"; } 
     189  if( filesystem == "FAT" ){ fstype = "mount -t msdosfs"; fsopts = "-o large,longnames,-m=644,-M=777"; } 
    190190  else if(filesystem == "NTFS"){ fstype = "ntfs-3g"; } 
    191191  else if(filesystem == "EXT"){ fstype = "mount -t ext2fs"; } 
Note: See TracChangeset for help on using the changeset viewer.