merge setup_crypto_disk.sh with other changes