Replace /etc/apt/grml.key with /etc/apt/trusted.gpg.d/grml-archive-keyring.gpg

/etc/apt/grml.key was a PGP public key block Public-Key (old) and
required installation via apt-key.

By instead placing a `GPG key public ring` into
/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg we don't need
this extra apt-key invocation any longer, which might actually
fail with:

| E: gnupg, gnupg2 and gnupg1 do not seem to be installed, but one of them is required for this operation

Installation of gnupg isn't enough though, since then we run
into:

| 10:45:56 Warning: apt-key output should not be parsed (stdout is not a terminal)
| 10:45:58 gpg: can't connect to the agent: IPC connect call failed

Drop old /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE via maintscript

Thanks: Antoine Beaupré <anarcat@debian.org> for a related PR
in https://github.com/grml/grml-debian-keyring/pull/3

diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript
new file mode 100644 (file)
index 0000000..168dd5d
--- /dev/null
+++ b/debian/grml-live.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE

diff --git a/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE b/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE
deleted file mode 100644 (file)
index 9733081..0000000
--- a/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE
+++ /dev/null
@@ -1,122 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-Hr1vfvwDEqTtPOvdZO3MrBGN
-=ckLq
------END PGP PUBLIC KEY BLOCK-----

diff --git a/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE b/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE
new file mode 100644 (file)
index 0000000..2ff6d25
Binary files /dev/null and b/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE differ

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 7255a2f..c50877f 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -80,9 +80,6 @@ if [ -n "${WAYBACK_DATE:-}" ] ; then
     "${target}/etc/apt/sources.list.d/debian.list"
 fi
 
     "${target}/etc/apt/sources.list.d/debian.list"
 fi
 

-# install Grml gpg key:
-$ROOTCMD apt-key add /etc/apt/grml.key
-

 if ! $ROOTCMD test -x /usr/bin/aptitude ; then
   echo "aptitude binary is not available, installing to make sure further FAI actions continue to work"
   $ROOTCMD apt-get update
 if ! $ROOTCMD test -x /usr/bin/aptitude ; then
   echo "aptitude binary is not available, installing to make sure further FAI actions continue to work"
   $ROOTCMD apt-get update