sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for GPG keyring

Browse Source 
Currently DIB_ADD_APT_KEYS only supports GPG armor keys, while
default Debuntu apt gpg keys are in keyring format.

Change-Id: I361c375e25b03a08b19052b10c6733939c8df921
This commit is contained in:
Felipe Alencastro 2019-11-07 17:32:05 -03:00
parent 6758849b66
commit 48ff601098
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys
View File

@ -26,7 +26,7 @@ if [ ! -d "${KEY_DIRECTORY}" ]; then
fi fi
for KEY in ${KEY_DIRECTORY}/*; do for KEY in ${KEY_DIRECTORY}/*; do
if ! file -b "${KEY}" | grep -q 'PGP public key block'; then if ! file -b "${KEY}" | grep -qE '(PGP public key block|GPG key public ring)'; then
echo "Skipping ${KEY}, not a valid GPG public key" echo "Skipping ${KEY}, not a valid GPG public key"
continue continue
fi fi