Better regexp in get_disk_format() to avoid over-matching