[PATCH] Fix setupDiskImages when the devices are already in the tree.