From 81b77b0f28368883a7b1c81fab60824cddc6e6eb Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Wed, 8 Jul 2020 13:49:52 +0200
Subject: [PATCH] novajoin: install 'freeipa-client' on both Debian and Ubuntu

freeipa-admintools got merged into 'freeipa-client' before Debian
'buster'.

Ubuntu 'focal' does not have transitional package so let's fix name
before we switch to it.

Change-Id: I32f62a763b909da787dee1007055197d6a2dbce1
---
 docker/novajoin/novajoin-base/Dockerfile.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/novajoin/novajoin-base/Dockerfile.j2 b/docker/novajoin/novajoin-base/Dockerfile.j2
index 690a75d34f..720649f889 100644
--- a/docker/novajoin/novajoin-base/Dockerfile.j2
+++ b/docker/novajoin/novajoin-base/Dockerfile.j2
@@ -26,9 +26,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
         {% set novajoin_base_packages = [
             'ipa-admintools',
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set novajoin_base_packages = [
-            'freeipa-admintools',
+            'freeipa-client',
         ] %}
     {% endif %}