Changeset 8ebea8d


Ignore:
Timestamp:
10/04/13 10:23:03 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
7429809
Parents:
9d437ac
Message:

Add an additional check to remove the camcontrol inquiry output if it contains "camcontrol". There was probably an error and it should not be used. (can mess up labels).

File:
1 edited

Legend:

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

    rdd95361 r8ebea8d  
    107107    camctl = pcbsd::Utils::runShellCommand( QString("camcontrol inquiry ")+node ).join(" "); 
    108108    if(camctl.contains(" Fixed Direct Access SCSI")){ detType = "SCSI"; } //USB devices do not have any output 
     109    if(camctl.contains("camcontrol")){ camctl.clear(); } //error or invalid device type 
    109110  } 
    110111  //Make sure we quit before running commands on any invalid device nodes 
Note: See TracChangeset for help on using the changeset viewer.