[neon/infrastructure/pangea-data] imager: --no-default-keyring

[Carlos De Maine]

Git commit 071027cb9afacce28e1864fcd4dcaf66fb91595a by Carlos De Maine.
Committed on 06/08/2024 at 06:42.
Pushed by carlosdem into branch 'master'.

--no-default-keyring

M  +1    -1    imager/config-hooks-neon/repo.sh
M  +1    -1    imager/ubuntu-defaults-image

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/071027cb9afacce28e1864fcd4dcaf66fb91595a

diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 25950dc..50daeb8 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -4,7 +4,7 @@ GPG="gpg"
 
 apt-key export '444D ABCF 3667 D028 3F89  4EDD E6D4 7362 5575 1E5D' | $GPG \
   $ARGS \
-  --home config/gnupg \
+  --no-default-keyring \
   --primary-keyring config/archives/ubuntu-defaults.key \
   --import
 
diff --git a/imager/ubuntu-defaults-image b/imager/ubuntu-defaults-image
index 392c6aa..ef47da7 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -77,7 +77,7 @@ add_ppas () {
         FINGERPRINT=${FINGERPRINT#'"'}
 
         # fetch GPG key
-        gpg --home config/gnupg --primary-keyring config/archives/ubuntu-defaults.key  --keyserver pool.sks-keyservers.net --recv-key "$FINGERPRINT"
+        gpg --home config/gnupg --no-default-keyring config/archives/ubuntu-defaults.key  --keyserver pool.sks-keyservers.net --recv-key "$FINGERPRINT"
 
         # add ppa apt source
         local DEB_PPA="deb http://ppa.launchpad.net/$ppa/ubuntu $SUITE main"