From 1370165b4b9780c2a0a46d72dc12fae343d9f67e Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 18 Nov 2008 23:43:33 +0100
Subject: [PATCH] Provide grml's gpg key via
 /etc/grml/fai/files/etc/apt/grml.key

---
 debian/changelog                            |   5 ++++-
 etc/grml/fai/config/hooks/instsoft.GRMLBASE |  15 ++++++++++-----
 etc/grml/fai/files/etc/apt/grml.key         | Bin 0 -> 1346 bytes
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 etc/grml/fai/files/etc/apt/grml.key

diff --git a/debian/changelog b/debian/changelog
index eca0c59..82f35d1 100644
--- 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.
+  * 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
 
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index e5d5452..1e0b7ca 100755
--- 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
 
-# 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
diff --git a/etc/grml/fai/files/etc/apt/grml.key b/etc/grml/fai/files/etc/apt/grml.key
new file mode 100644
index 0000000000000000000000000000000000000000..95e99450ef97188ff5a264ead566c655e8298454
GIT binary patch
literal 1346
zcmV-I1-<&20ipy&U}WqO1OR{)M9_W{$^$0D-6e7>=xCEN=O*TJA}ys8{G#5B^rl~s
z0|Q*v9*iTwXdkqAaI6b*LZ$wiu;j4b;*82+<b~bzrZ%S&LAv)!=7=rg%Ye_b43GJs
z3>1q{C%V4&;2K%d!hR>}1{>J(1&JF8=l3BRStO9)Q>Zp9-&(1JyN3Xvnb0%{h=MC&
zQ~vZj0vD;!4sK|X1O6-sE1zfUSMqqTc0^`kCNpd0+1;b0IL|vd#EPqf^k!%+4X=du
zO(F*Y{t+4?eY3krFV_xsxsEDigMxy5faF)B>8y7am6eUW4CYcQybC^Ub3q{AY@9d6
zf-%MK{kTBA#f#E-kVI5n{-a^Jj*!|aHu^@?@O;zj81FQg76JqQEWWgrL7(*NBxjX>
z!d5OvnU6`F7FQs0wGaqtr5RO6!WL8~9l{VPacTl@<Zy}kBu&uU93c`7Hqr>C40#=Y
zOko`)l6|KKqKFJUi^AJq01ea0kHi{&D!xsbBJr^%Rj@^0<LQHJlo(&t4bkq1JYu%`
zGY?X#401O>+Yxi)v`$A-O-vv`a${&|c4Z(zb#!lSVRUI@AX8~)ZfS03AWLO=ASh^b
zbZ|N^FL!r$E@yIWY%XtdXD=xrJZ5xoZDDhCWpY4ga&2rbZ*pfoh+qU05dr`p1p-B2
zWb6VP0|pBT2nPcK1Qh}Z0|XWV0|5da0Rk6*0162Z_8u;L?B1t`hkO8@I)p=~4P^oH
zNw2{J)<u%esWvng0HBJo(FnZu(NH|fI2I-I2LsNjVU37J1P~Dd00spDMPOw?0162Z
z(_6fmynO-+ekTB+gU1C#w95V~JZrS6Ze_@QWBypo0HDu3_lMO$u$*ao@9*E|MHsZ+
zHQI<q1P~Dd00spDMPO&a0162Z*xyt8H{x>WXbAwHZ-K+YMzF-)`eJmS!cbS_Cw<F)
z0G=@nR=SV;_QbwHLSOx@;2=uCp$oYJ4FpACWd9Hd0MVCnlhGW()l*og%Qh$rU%m)4
zp2`Pt^noX>JHWKm!o}lTUUV&3f@+V{UzdoF^A*|9COfTEKOF~H0{XRBO-(z{odU~2
zvhW5<;<P1jXxhWXs9Qwz^1O<`OiK6#eN0M|y1tg9D$wgF2?<G8YHd#EZ<`{5*qhT^
zOSzOTJ~e_651}TSEh-7+veeWORVm%003VCu4VYon5f2@m4ub_1S)Qx2j#V+9>xml_
z^02dT9I+?lBTit!p$KJZYwU1~x7!APh~j4dFipoQXl*)|=D9s$B}FjBF{{x4M2+}%
zpEy$D%)uB}6elyqaPCdQqn{QFCKBBvz6v77M*sr{2mg1L1<tP1qMy=G8kE(5n`^Y1
z6om;XkN^&6pKw*7mc$2D_E*V5Ij4de4oQOHJIO#$bFk&!a-jjL$6Prg<}PXl0T<z8
zgAmH2$z(q-_FbMd1Min+hUFa$nt?8G-G^mFm+remLi1G}IMmhr8PA?5T+XbK+dHVy
z#fI2iZ%&QZYs$M?%XRpkf0EK_d2AA>*Q4k$?iirz#Xh(^E3#bd4MNk1KEp;VuKvnc
z$NkBt9A4x4<kS@9V!QpFDVzBY*g(0UHgH6!)s+t~35~g2ur~sY7}w~r5FipA4Qz}-
zj?tT=bu~j|p@qUqQul%X8TKDIiL#lEDD-7}b!3Q11Q-zl00{*GMPOwA0vikf3JDPQ
z9xi<B-lvDog#e#a1{RWMDVulTe!Bi3-#_9+S9uixpq5u>2&bHapf_cU;WDxY|0}v4
E91zo3&Hw-a

literal 0
HcmV?d00001

-- 
2.1.4