Browse Source

Merge "Adds support for GPG keyring"

tags/2.30.0
Zuul 2 weeks ago
parent
commit
f268c72ed9
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys

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

@@ -26,7 +26,7 @@ if [ ! -d "${KEY_DIRECTORY}" ]; then
fi

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"
continue
fi

Loading…
Cancel
Save