Merge "Add keyring if supplied"
This commit is contained in:
commit
2343d4b577
@ -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,
|
||||
|
@ -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//,/ }
|
||||
|
Loading…
Reference in New Issue
Block a user