diff --git a/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall b/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall index ceb51bf11..172447697 100755 --- a/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall +++ b/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall @@ -24,6 +24,11 @@ fi set -eu set -o pipefail +# NOTE(SamYaple): Add the keyring deboostrap used if specified +if [ -n "${DIB_APT_KEYRING:-${DIB_DEBIAN_KEYRING:-}}" ]; then + cat $DIB_APT_KEYRING | sudo chroot $TARGET_ROOT /usr/bin/apt-key add - +fi + # Writes the apt sources files. # The description is passed in via line coded elements. # (The approach using associative arrays for configuration faild, diff --git a/diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall b/diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall index 1835e1970..f9b90e707 100755 --- a/diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall +++ b/diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall @@ -21,6 +21,11 @@ fi set -eu set -o pipefail +# NOTE(SamYaple): Add the keyring deboostrap used if specified +if [ -n "${DIB_APT_KEYRING:-${DIB_DEBIAN_KEYRING:-}}" ]; then + cat $DIB_APT_KEYRING | sudo chroot $TARGET_ROOT /usr/bin/apt-key add - +fi + # We should manage this in a betterer way sudo bash -c "cat << EOF >$TARGET_ROOT/etc/apt/sources.list deb $DIB_DISTRIBUTION_MIRROR $DIB_RELEASE ${DIB_DEBIAN_COMPONENTS//,/ }