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 7222028..1e0b7ca 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Nov 12 11:14:32 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -14,7 +13,8 @@ set -e
 echo grml_chroot > $target/etc/debian_chroot
 
 HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 echo "$HOSTNAME" > $target/etc/hostname
 
@@ -22,11 +22,11 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Softupdate of FAI via grml-live running"
 
    if [ -r /etc/resolv.conf ] ; then
-     if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
-        cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-     else
-        cat /etc/resolv.conf >> $target/etc/resolv.conf
-     fi
+      if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+         cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+      else
+         cat /etc/resolv.conf >> $target/etc/resolv.conf
+      fi
    fi
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
@@ -56,6 +56,8 @@ EOF
       fi
    fi
 
+   # 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
@@ -63,10 +65,15 @@ EOF
       cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
    fi
 
-   # FAI softupdate does not execute upgrade, so let's do it on our own:
+   # run it on our own, as updatebase is used at the wrong stage for our needs,
+   # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE
    $ROOTCMD apt-get update
+   if ! [ -x $target/usr/bin/aptitude ] ; then
+      $ROOTCMD apt-get -y install aptitude
+   fi
+
    if [ -x $target/usr/bin/aptitude ] ; then
-      if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
+      if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
          $ROOTCMD aptitude -y safe-upgrade
       else
          $ROOTCMD aptitude -y upgrade
@@ -83,12 +90,19 @@ echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/a
 
 # Recommends just pull in way tooooo much packages, so disable it:
 echo "APT::Install-Recommends "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
+# 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:
+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