Move disk detection into a new function.

New function is now much more selective.