From 161575af0b16ce190bd1b5d30c7b882cf37c8a8f Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 15 Jun 2018 14:55:10 +0200 Subject: [PATCH] TT#38454 Install 'openssh-server' package for non-ngcp debootstrap NGCP metapackages depends on 'ssh' already. So no need to install it during the debootstrap process. So far deployment.sh is being used to recover from Puppet (ssh module cares about 'openssh-server/-client already) and also for Debian plain installation where we still need to install 'openssh-server' manually. Change-Id: If9c052f0517b1610f0e65ed4a574539b23e23928 --- templates/scripts/includes/deployment.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh index 716a1fa..f4a17bd 100755 --- a/templates/scripts/includes/deployment.sh +++ b/templates/scripts/includes/deployment.sh @@ -1206,8 +1206,19 @@ lvm_setup # otherwise e2fsck fails with "need terminal for interactive repairs" echo FSCK=no >>/etc/debootstrap/config +echo "Clean the default /etc/debootstrap/packages" +echo > /etc/debootstrap/packages + +if ! "$NGCP_INSTALLER" ; then + echo "Install openssh-server to be able to login on the Debian plain system" + cat >> /etc/debootstrap/packages << EOF +# to be able to login on the Debian plain system via SSH +openssh-server +EOF +fi + # WARNING: consider to add NGCP packages to NGCP metapackage! -cat > /etc/debootstrap/packages << EOF +cat >> /etc/debootstrap/packages << EOF # addons: packages which d-i installs but debootstrap doesn't eject grub-pc @@ -1223,9 +1234,6 @@ locales-all firmware-bnx2 firmware-bnx2x -# be able to login on the system, even if just installing plain Debian -openssh-server - # TT#5444 ca-certificates is necessary to wget ngcp-installer over https ca-certificates