From 89e6ba5af72041361acf916294fc5d13741098cc Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sat, 2 Jan 2021 17:27:16 +0100
Subject: [PATCH] [mod] add Ubuntu 20.10 image to the LXC suite

Ubuntu 20.10 image [1] is avialable from https://images.linuxcontainers.org

BTW: replace builhost package 'ttf-dejavu' by more common meta package
'fonts-dejavu' ('ttf-dejavu' is no longer available in 20.10).

[1] https://github.com/lxc/lxc-ci/commit/d161de601bffe4055d77b9d52a826ce5d81567d9

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/lxc-searx.env | 1 +
 utils/lxc.sh        | 2 ++
 utils/searx.sh      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env
index 03a4aac8..3121b63c 100644
--- a/utils/lxc-searx.env
+++ b/utils/lxc-searx.env
@@ -24,6 +24,7 @@ lxc_set_suite_env() {
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04"  "ubu1604" # April 2021
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04"  "ubu1804" # April 2023
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04"  "ubu2004" # April 2025
+        "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10"  "ubu2010" # July 2021
 
         # EOL see https://fedoraproject.org/wiki/Releases
         "$LINUXCONTAINERS_ORG_NAME:fedora/31"     "fedora31"
diff --git a/utils/lxc.sh b/utils/lxc.sh
index 2737a188..39701ef0 100755
--- a/utils/lxc.sh
+++ b/utils/lxc.sh
@@ -39,6 +39,8 @@ $ubu1904_boilerplate
 echo 'Set disable_coredump false' >> /etc/sudo.conf
 "
 
+ubu2010_boilerplate="$ubu1904_boilerplate"
+
 # shellcheck disable=SC2034
 archlinux_boilerplate="
 pacman -Syu --noconfirm
diff --git a/utils/searx.sh b/utils/searx.sh
index 3a21e222..b7d3b8e1 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -50,7 +50,7 @@ shellcheck"
 
 BUILD_PACKAGES_debian="\
 firefox graphviz imagemagick texlive-xetex librsvg2-bin
-texlive-latex-recommended texlive-extra-utils ttf-dejavu
+texlive-latex-recommended texlive-extra-utils fonts-dejavu
 latexmk"
 
 # pacman packages