openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Add keyring if supplied"

This commit is contained in:
Zuul 2018-07-10 07:46:55 +00:00 committed by Gerrit Code Review
parent 7e4e6cfff4 c144246cc9
commit 2343d4b577
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall
View File

@ -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,

5
diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall
View File

@ -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//,/ }