From ec809157f88b6c5d8cf5b58dbcaf00b4d8a0ed75 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:41:56 -0400
Subject: [PATCH] Add per-release packages

---
 install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 7564168..a02198f 100755
--- a/install.sh
+++ b/install.sh
@@ -9,9 +9,13 @@ logfile="/tmp/pvc-install.log"
 supported_debrelease="buster bullseye"
 default_debrelease="buster"
 default_debmirror="http://debian.mirror.rafal.ca/debian"
-debpkglist="lvm2,parted,gdisk,grub-pc,grub-efi-amd64,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server,vlan,ifenslave,python,python2,python3,ca-certificates,ntp"
+debpkglist="lvm2,parted,gdisk,grub-pc,grub-efi-amd64,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server,vlan,ifenslave,python2,python3,ca-certificates,ntp"
 suppkglist="firmware-linux,firmware-linux-nonfree,firmware-bnx2,firmware-bnx2x"
 
+declare -a debpkglist_release
+debpkglist_release[buster]=",python"
+debpkglist_release[bullseye]=",python-is-python3"
+
 # DANGER - THIS PASSWORD IS PUBLIC
 # It should be used ONLY immediately after booting the PVC node in a SECURE environment
 # to facilitate troubleshooting of a failed boot. It should NOT be exposed to the Internet,
@@ -225,7 +229,7 @@ while [[ -z ${debrelease} ]]; do
     if [[ -z ${debrelease} ]]; then
         debrelease="${default_debrelease}"
     fi
-    if ! grep "${debrelease}" <<<"${supported_debrelease}"; then
+    if ! grep -qw "${debrelease}" <<<"${supported_debrelease}"; then
         debrelease=""
         echo
         echo "Please enter a valid release."
@@ -425,6 +429,7 @@ mount -t tmpfs tmpfs ${target}/tmp >&2
 echo "done."
 
 echo -n "Running debootstrap install... "
+debpkglist+=${debpkglist_release[${debrelease}]}
 debootstrap --include=${debpkglist} ${debrelease} ${target}/ ${debmirror} >&2
 echo "done."