stretch+: preseed correctly sets up our keyring, so drop package

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

lib/buster-preseed.cfg

@@ -243,7 +243,7 @@ d-i apt-setup/local0/key string http://repos.rcn-ee.com/debian/conf/custom.gpg
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
 #RCNEE: we have a bunch to add
-d-i pkgsel/include string bash dosfstools initramfs-tools rcn-ee-archive-keyring util-linux wget board-firmware net-tools sudo
+d-i pkgsel/include string bash dosfstools initramfs-tools util-linux wget board-firmware net-tools sudo
 #RCNEE: ^
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

lib/stretch-preseed.cfg

@@ -243,7 +243,7 @@ d-i apt-setup/local0/key string http://repos.rcn-ee.com/debian/conf/custom.gpg
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
 #RCNEE: we have a bunch to add
-d-i pkgsel/include string bash dosfstools initramfs-tools rcn-ee-archive-keyring util-linux wget board-firmware net-tools sudo
+d-i pkgsel/include string bash dosfstools initramfs-tools util-linux wget board-firmware net-tools sudo
 #RCNEE: ^
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

mk_mmc.sh

@@ -774,12 +774,12 @@ initrd_preseed_settings () {
 
 	if [ ! "x${deb_not_in_repo}" = "xenable" ] ; then
 		#repos.rcn-ee.com: add linux-image-${uname -r}
-		sed -i -e 's:rcn-ee-archive-keyring:rcn-ee-archive-keyring linux-image-'$uname_r':g' "${TEMPDIR}/initrd-tree/preseed.cfg"
+		sed -i -e 's:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' "${TEMPDIR}/initrd-tree/preseed.cfg"
 		cat "${TEMPDIR}/initrd-tree/preseed.cfg" | grep linux-image
 	fi
 
 	if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
-		sed -i -e 's:rcn-ee-archive-keyring:rcn-ee-archive-keyring u-boot-tools:g' "${TEMPDIR}/initrd-tree/preseed.cfg"
+		sed -i -e 's:initramfs-tools:initramfs-tools u-boot-tools:g' "${TEMPDIR}/initrd-tree/preseed.cfg"
 	fi
 
 	cd "${DIR}/" || true