Allow overriding the auto-detected device, and fix a partition-naming bug.