Fix upgrade for when the rootfs is still in the data partition