Make building stage3-chroot more robust.