Convert preseed to supplemental package list

Converts the option that the preseed file gives into a supplemental
package list by default to avoid accidentally overwriting required
packages.

Also add ipmitool to the supplemental packages list.
This commit is contained in:
Joshua Boniface 2023-09-01 15:41:57 -04:00
parent d4640df3ce
commit ee89c0f5ad
1 changed files with 8 additions and 4 deletions

View File

@ -56,8 +56,8 @@ supported_debrelease="buster bullseye"
default_debrelease="buster" default_debrelease="buster"
default_debmirror="http://debian.mirror.rafal.ca/debian" default_debmirror="http://debian.mirror.rafal.ca/debian"
inclpkglist="lvm2,parted,gdisk,grub-pc,grub-efi-amd64,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server,vlan,ifenslave,python3,ca-certificates,curl" basepkglist="lvm2,parted,gdisk,grub-pc,grub-efi-amd64,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server,vlan,ifenslave,python3,ca-certificates,curl"
suppkglist="firmware-linux,firmware-linux-nonfree,firmware-bnx2,firmware-bnx2x,ntp" suppkglist="firmware-linux,firmware-linux-nonfree,firmware-bnx2,firmware-bnx2x,ntp,ipmitool"
# DANGER - THIS PASSWORD IS PUBLIC # DANGER - THIS PASSWORD IS PUBLIC
# It should be used ONLY immediately after booting the PVC node in a SECURE environment # It should be used ONLY immediately after booting the PVC node in a SECURE environment
@ -119,6 +119,10 @@ seed_config() {
. /tmp/install.seed || exit 1 . /tmp/install.seed || exit 1
if [[ -n "${addpkglist}" ]]; then
suppkglist="${suppkglist},${addpkglist}"
fi
# Handle the target interface # Handle the target interface
target_route="$( ip route show to match ${seed_host} | grep 'scope link' )" target_route="$( ip route show to match ${seed_host} | grep 'scope link' )"
target_interface="$( grep -E -o 'e[a-z]+[0-9]+[a-z0-9]*' <<<"${target_route}" )" target_interface="$( grep -E -o 'e[a-z]+[0-9]+[a-z0-9]*' <<<"${target_route}" )"
@ -639,8 +643,8 @@ mount -t tmpfs tmpfs ${target}/tmp >&2
echo "done." echo "done."
echo -n "Running debootstrap install... " echo -n "Running debootstrap install... "
echo "Command: debootstrap --include=${inclpkglist} ${debrelease} ${target}/ ${debmirror}" >&2 echo "Command: debootstrap --include=${basepkglist} ${debrelease} ${target}/ ${debmirror}" >&2
debootstrap --include=${inclpkglist} ${debrelease} ${target}/ ${debmirror} >&2 debootstrap --include=${basepkglist} ${debrelease} ${target}/ ${debmirror} >&2
echo "done." echo "done."
echo -n "Adding non-free repository (firmware, etc.)... " echo -n "Adding non-free repository (firmware, etc.)... "