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

[grml-live.git] / etc / grml / fai / config / hooks / instsoft.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index ad9f199..1e0b7ca 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -56,18 +56,14 @@ EOF
       fi
    fi
 
-   # 081015: deactivated because it seems to be unnecessary for
-   #         stable release maintenance - keep the code for now
-   #         if we re-notice any problems
-   #
    # FAI softupdate executes upgrade only with the sources.list being
    # present in the chroot :-/ - so let's do it on our own:
-#   if [ -r /etc/grml/fai/apt/sources.list ] ; then
-#      if [ -L $target/etc/apt/sources.list ] ; then
-#         rm $target/etc/apt/sources.list
-#      fi
-#      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
-#   fi
+   if [ -r /etc/grml/fai/apt/sources.list ] ; then
+      if [ -L $target/etc/apt/sources.list ] ; then
+         rm $target/etc/apt/sources.list
+      fi
+      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+   fi
 
    # run it on our own, as updatebase is used at the wrong stage for our needs,
    # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -97,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