From c7d92d64753334af303e7a5fcbe1b041d933ba1e Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sat, 2 Jan 2021 17:23:18 +0100
Subject: [PATCH] [fix] remove Ubuntu 19.10 from the LXC suite (EOL)

Official support for Ubuntu 19.10 'Eoan Ermine' ended on July 17, 2020.

The image has been dropped [1] from https://images.linuxcontainers.org

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

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

diff --git a/utils/lib.sh b/utils/lib.sh
index 83dd75077..8ae6bdd44 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -1429,9 +1429,9 @@ lxc_install_base_packages() {
 
 lxc_image_copy() {
 
-    # usage: lxc_copy_image <remote image> <local image>
+    # usage: lxc_image_copy <remote image> <local image>
     #
-    #        lxc_copy_image "images:ubuntu/19.10"  "ubu1910"
+    #        lxc_image_copy "images:ubuntu/20.04"  "ubu2004"
 
     if lxc_image_exists "local:${LXC_SUITE[i+1]}"; then
         info_msg "image ${LXC_SUITE[i]} already copied --> ${LXC_SUITE[i+1]}"
diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env
index 3ce10021b..03a4aac8c 100644
--- a/utils/lxc-searx.env
+++ b/utils/lxc-searx.env
@@ -23,8 +23,7 @@ lxc_set_suite_env() {
         # end of standard support see https://wiki.ubuntu.com/Releases
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/16.04"  "ubu1604" # April 2021
         "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04"  "ubu1804" # April 2023
-        "$LINUXCONTAINERS_ORG_NAME:ubuntu/19.10"  "ubu1910" # July 2020
-        "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04"  "ubu2004" # future (EOL 2030)
+        "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04"  "ubu2004" # April 2025
 
         # EOL see https://fedoraproject.org/wiki/Releases
         "$LINUXCONTAINERS_ORG_NAME:fedora/31"     "fedora31"
diff --git a/utils/lxc.sh b/utils/lxc.sh
index 11dbe578d..2737a188b 100755
--- a/utils/lxc.sh
+++ b/utils/lxc.sh
@@ -32,11 +32,10 @@ apt-get install -y git curl wget
 "
 ubu1804_boilerplate="$ubu1604_boilerplate"
 ubu1904_boilerplate="$ubu1804_boilerplate"
-ubu1910_boilerplate="$ubu1904_boilerplate"
 
 # shellcheck disable=SC2034
 ubu2004_boilerplate="
-$ubu1910_boilerplate
+$ubu1904_boilerplate
 echo 'Set disable_coredump false' >> /etc/sudo.conf
 "