X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=1e5ce06442cdfe47d1b92d60dac57e77ba42e3aa;hp=f47a91d454772712e822a9467c17d0b03c55d044;hb=7fa9c329d85bf44b690aa7457597e3acee0633de;hpb=7ca02816220f36c7db5ca4fe3753990b5c4bc3b2

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index f47a91d..1e5ce06 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,7 @@
 # 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 Okt 29 23:35:34 CET 2007 [mika]
+# Latest change: Sun Nov 04 14:37:26 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -14,7 +14,20 @@ set -e
 echo grml_chroot > $target/etc/debian_chroot
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   echo "Softupdate"
+   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
+   fi
+
+   if [ -r $target/etc/policy-rc.d.conf ] ; then
+      sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
+   fi
+
    # make sure we prefer grml repository:
    if [ -r /etc/grml/fai/apt/preferences ] ; then
       cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
@@ -27,7 +40,17 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
       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:
    $ROOTCMD apt-get update
+   if [ -x $target/usr/bin/aptitude ] ; then
+      if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
+         $ROOTCMD aptitude safe-upgrade
+      else
+         $ROOTCMD aptitude upgrade
+      fi
+   else
+      $ROOTCMD apt-get upgrade
+   fi
 
 else # no softupdate but fresh installation
 
@@ -35,6 +58,9 @@ else # no softupdate but fresh installation
 # should be removed later on:
 echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/apt/apt.conf
 
+# 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