testing: move Ubuntu to 22.04 LTS, make column available to Debian/Ub…

…untu
zbm-dev · Jun 29, 2022 · 9b57d8a · 9b57d8a
1 parent feb6a26
commit 9b57d8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/testing/helpers/chroot-debian.sh b/testing/helpers/chroot-debian.sh
@@ -12,7 +12,8 @@ export TERM=linux
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
-apt-get install --yes locales console-setup ca-certificates openssh-{client,server}
+apt-get install --yes bsdextrautils \
+	locales console-setup ca-certificates openssh-{client,server}
 dpkg-reconfigure -f noninteractive
 
 # Make sure the kernel is installed and configured before ZFS

diff --git a/testing/helpers/chroot-ubuntu.sh b/testing/helpers/chroot-ubuntu.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 cat << EOF > /etc/apt/sources.list
-deb http://us.archive.ubuntu.com/ubuntu focal main restricted universe multiverse
-deb-src http://us.archive.ubuntu.com/ubuntu focal main restricted universe multiverse
+deb http://us.archive.ubuntu.com/ubuntu jammy main restricted universe multiverse
+deb-src http://us.archive.ubuntu.com/ubuntu jammy main restricted universe multiverse
 EOF
 
-cat << EOF > /etc/apt/sources.list.d/focal-backports.list
-deb http://us.archive.ubuntu.com/ubuntu focal-backports main restricted universe multiverse
-deb-src http://us.archive.ubuntu.com/ubuntu focal-backports main restricted universe multiverse
+cat << EOF > /etc/apt/sources.list.d/jammy-backports.list
+deb http://us.archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse
+deb-src http://us.archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse
 EOF
 
 apt-get update
@@ -17,8 +17,9 @@ export TERM=linux
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
-apt-get install --yes locales console-setup ca-certificates openssh-{client,server}
-dpkg-reconfigure -f noninteractive
+apt-get install --yes bsdextrautils \
+	locales console-setup ca-certificates openssh-{client,server}
+dpkg --configure -a
 
 # Make sure the kernel is installed and configured before ZFS
 # Don't allow the kernel to pull in recommended packages (including GRUB)

diff --git a/testing/helpers/install-debian.sh b/testing/helpers/install-debian.sh
@@ -7,7 +7,7 @@ if [ -z "${CHROOT_MNT}" ] || [ ! -d "${CHROOT_MNT}" ]; then
 fi
 
 if [[ "$0" =~ "ubuntu" ]]; then
-  SUITE="focal"
+  SUITE="jammy"
   MIRROR="http://us.archive.ubuntu.com/ubuntu/"
   CONFIGURATOR="configure-ubuntu.sh"
 else