From 036e84fbe6f3e22d2eec595b9964acf1dacfafb7 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Wed, 11 Apr 2018 16:02:48 +0200
Subject: [PATCH] TT#28952 remove apt-transport-https manual installation
 inside GRML

We are based on the latest GRML nowadays which is based on Debian sid 2018-11-04.
apt-transport-https has been merged into apt package since version 1.5,
so far there is no need to install it manually, moreover sid contains
dummy transitional package 'apt-transport-https' which cause:

>> apt-get install apt-transport-https
> The following packages will be REMOVED:
>   apt apt-utils tasksel tasksel-data
> The following NEW packages will be installed:
>   apt-transport-https
> WARNING: The following essential packages will be removed.
> This should NOT be done unless you know exactly what you are doing!
>   apt
> 0 upgraded, 1 newly installed, 4 to remove and 0 not upgraded.
> Need to get 171 kB of archives.
> After this operation, 5,342 kB disk space will be freed.
> You are about to do something potentially harmful.
> To continue type in the phrase 'Yes, do as I say!'

The fool protection is always good. Deleting manual apt-transport-https
installation from GRML part of deployment.sh

P.S. there is one more 'apt-transport-https' stay inside debootstrap,
as we use Debian stretch in NGCP currently while apt-transport-https
has been merged in Debian buster+, it should stay for a while.

Change-Id: Ifcf84f3d79ecc44465f97d42bbae12be04d8407e
---
 templates/scripts/includes/deployment.sh | 29 ------------------------
 1 file changed, 29 deletions(-)

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