Add diffutils to buildenv
Add mount-chroot script