Use more flexible method to check added partitions, modify check_in_vm f...

...unction.