From 48ff60109862f8387330db357999b1330c5b12c6 Mon Sep 17 00:00:00 2001 From: Felipe Alencastro Date: Thu, 7 Nov 2019 17:32:05 -0300 Subject: [PATCH] Adds support for GPG keyring Currently DIB_ADD_APT_KEYS only supports GPG armor keys, while default Debuntu apt gpg keys are in keyring format. Change-Id: I361c375e25b03a08b19052b10c6733939c8df921 --- diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys b/diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys index aa2f38ae0..a60f4c0ff 100755 --- a/diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys +++ b/diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys @@ -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