Provide grml's gpg key via /etc/grml/fai/files/etc/apt/grml.key

diff --git a/debian/changelog b/debian/changelog
index eca0c59..82f35d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,11 @@ grml-live (0.9.6) unstable; urgency=low
     /usr/share/locale on GRML_FULL, just too much to ship by default,
     message at startup sucks).
   * Update grml-cheatcodes.txt.
     /usr/share/locale on GRML_FULL, just too much to ship by default,
     message at startup sucks).
   * Update grml-cheatcodes.txt.

+  * Provide grml's gpg key via /etc/grml/fai/files/etc/apt/grml.key
+    so we support offline operation as well. Based on an idea by
+    Thomas Lehmann, thanks!

 
 

- -- Michael Prokop <mika@grml.org>  Mon, 17 Nov 2008 12:05:08 +0100
+ -- Michael Prokop <mika@grml.org>  Tue, 18 Nov 2008 23:42:32 +0100

 
 grml-live (0.9.5) unstable; urgency=low
 
 
 grml-live (0.9.5) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index e5d5452..1e0b7ca 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -93,11 +93,16 @@ 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
 
 # Notice: deprecated since aptitude (0.4.11-1):
 echo "Aptitude::Recommends-Important "false"; // added by grml-live" >> $target/etc/apt/apt.conf
 

-# install grml keys:
-gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \
-gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
-gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
-$ROOTCMD apt-key add /etc/apt/grml.key
+# install 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
+else
+   gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \
+   gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
+   gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
+   $ROOTCMD apt-key add /etc/apt/grml.key
+fi

 
 # make sure we prefer grml repository:
 if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
 
 # make sure we prefer grml repository:
 if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then

diff --git a/etc/grml/fai/files/etc/apt/grml.key b/etc/grml/fai/files/etc/apt/grml.key
new file mode 100644 (file)
index 0000000..95e9945
Binary files /dev/null and b/etc/grml/fai/files/etc/apt/grml.key differ