testing: move debian to bullseye

zbm-dev · Oct 24, 2021 · c048ead · c048ead
1 parent 7bb154d
commit c048ead
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/testing/helpers/chroot-debian.sh b/testing/helpers/chroot-debian.sh
@@ -1,23 +1,12 @@
 #!/bin/bash
 
 cat << EOF > /etc/apt/sources.list
-deb http://deb.debian.org/debian buster main contrib
-deb-src http://deb.debian.org/debian buster main contrib
-EOF
-
-cat << EOF > /etc/apt/sources.list.d/buster-backports.list
-deb http://deb.debian.org/debian buster-backports main contrib
-deb-src http://deb.debian.org/debian buster-backports main contrib
+deb http://deb.debian.org/debian bullseye main contrib
+deb-src http://deb.debian.org/debian bullseye main contrib
 EOF
 
 apt-get update
 
-cat << EOF > /etc/apt/preferences.d/90_zfs
-Package: libnvpair1linux libuutil1linux libzfs2linux libzfslinux-dev libzpool2linux python3-pyzfs pyzfs-doc spl spl-dkms zfs-dkms zfs-dracut zfs-initramfs zfs-test zfsutils-linux zfsutils-linux-dev zfs-zed
-Pin: release n=buster-backports
-Pin-Priority: 990
-EOF
-
 # Prevent terminal stupidity and interactive prompts
 export TERM=linux
 export DEBIAN_FRONTEND=noninteractive

diff --git a/testing/helpers/configure-debian.sh b/testing/helpers/configure-debian.sh
@@ -22,7 +22,7 @@ if [ -x /root/network-systemd.sh ]; then
 fi
 
 # Remove build tools
-apt-get autoremove
+apt-get --yes autoremove
 
 # If not using /hostcache, clean the cache
 [ -d /hostcache ] || apt-get clean
diff --git a/testing/helpers/install-debian.sh b/testing/helpers/install-debian.sh
@@ -11,7 +11,7 @@ if [[ "$0" =~ "ubuntu" ]]; then
   MIRROR="http://us.archive.ubuntu.com/ubuntu/"
   CONFIGURATOR="configure-ubuntu.sh"
 else
-  SUITE="buster"
+  SUITE="bullseye"
   MIRROR="http://ftp.us.debian.org/debian/"
   CONFIGURATOR="configure-debian.sh"
 fi