support installation of multiple gpg keys via /etc/grml/fai/files/etc/apt/*.key

diff --git a/debian/changelog b/debian/changelog
index b730e96..2e23ca8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,10 @@ grml-live (0.9.9) unstable; urgency=low
     so we can grep for it in any case.
   * 15-initsetup: keep a backup of the original runlevel.conf file.
     Thanks to Thomas Lehmann for the idea! [Closes: issue570]
+  * instsoft.GRMLBASE: support installation of multiple gpg keys
+    via /etc/grml/fai/files/etc/apt/*.key
 
- -- Michael Prokop <mika@grml.org>  Sat, 21 Feb 2009 14:25:49 +0100
+ -- Michael Prokop <mika@grml.org>  Sat, 21 Feb 2009 14:37:57 +0100
 
 grml-live (0.9.8) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 1e0b7ca..de5055c 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -93,10 +93,13 @@ echo "APT::Install-Recommends "false"; // added by grml-live"   >> $target/etc/a
 # Notice: deprecated since aptitude (0.4.11-1):
 echo "Aptitude::Recommends-Important "false"; // added by grml-live" >> $target/etc/apt/apt.conf
 
-# install grml gpg keys:
+# install all present (but at least the grml) gpg keys:
 if [ -r /etc/grml/fai/files/etc/apt/grml.key ] ; then
-   cp /etc/grml/fai/files/etc/apt/grml.key $target/etc/apt/grml.key
-   $ROOTCMD apt-key add /etc/apt/grml.key
+   for file in /etc/grml/fai/files/etc/apt/*.key ; do
+      FILE="$(basename $file)"
+      cp $file $target/etc/apt/"$FILE"
+      $ROOTCMD apt-key add /etc/apt/"$FILE"
+   done
 else
    gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \
    gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787