We still have the problem where the partition table or device appears too late.
Hopefully this fixes it.