more work on build-avalon-image.sh