From b5f0e1d39ce875437d2febe40301f7be0a5b36a8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 28 Feb 2020 12:22:50 -0600 Subject: [PATCH] stretch+: preseed correctly sets up our keyring, so drop package Signed-off-by: Robert Nelson --- lib/buster-preseed.cfg | 2 +- lib/stretch-preseed.cfg | 2 +- mk_mmc.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/buster-preseed.cfg b/lib/buster-preseed.cfg index 1bd62f2..0236a9b 100644 --- a/lib/buster-preseed.cfg +++ b/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 diff --git a/lib/stretch-preseed.cfg b/lib/stretch-preseed.cfg index 64b1dd6..1c8438e 100644 --- a/lib/stretch-preseed.cfg +++ b/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 diff --git a/mk_mmc.sh b/mk_mmc.sh index ee7769a..4674f71 100755 --- a/mk_mmc.sh +++ b/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