Escape hyphens in volume group names too.

If a VG has a hyphen in the name, partition_location will not have the
correct path. Must escape hyphens there too.