Use better regex for primary disk matching