diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh index 7c40cf7..6754aed 100644 --- a/templates/scripts/includes/deployment.sh +++ b/templates/scripts/includes/deployment.sh @@ -198,32 +198,6 @@ install_sipwise_key() { debootstrap_sipwise_key } -install_apt_transport_https () { - echo "Installing apt-transport-https" - - if [ "$(dpkg-query -f "\${db:Status-Status} \${db:Status-Eflag}" -W apt-transport-https 2>/dev/null)" = 'installed ok' ]; then - echo "apt-transport-https is already installed, nothing to do about it." - return 0 - fi - - # use temporary apt database for speed reasons - local TMPDIR - TMPDIR=$(mktemp -d) - mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \ - "${TMPDIR}/cachedir/archives/partial" - echo "deb http://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE} main contrib non-free" > \ - "${TMPDIR}/etc/sources.list" - - DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ - -o dir::state="${TMPDIR}/statedir" -o dir::etc="${TMPDIR}/etc" \ - -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" update - - DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ - -o dir::etc="${TMPDIR}/etc" -o dir::state="${TMPDIR}/statedir" \ - -o dir::etc::trustedparts="/etc/apt/trusted.gpg.d/" \ - -y --no-install-recommends install apt-transport-https -} - install_fai_setup_storage () { echo "Installing fai-setup-storage (it is missing on GRML 'small')" @@ -825,9 +799,6 @@ fi set_deploy_status "installing_sipwise_keys" install_sipwise_key -set_deploy_status "installing_apt_transport_https" -install_apt_transport_https - set_deploy_status "debootstrap_upgrade" debootstrap_upgrade