X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=2a00b399e00e1d19bd74ce0497db5b3d1549d492;hp=003e16ad4e7e6945d18a0d569dbfaebce1f57779;hb=b234fe9a308985a68371a8151f269d57593d91eb;hpb=0bd3648eb4a6f8c956cc808223ffe999d8626768

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 003e16a..2a00b39 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: Sun Nov 04 11:08:53 CET 2007 [mika]
+# Latest change: Sun Nov 04 14:37:26 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -17,12 +17,16 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Softupdate of FAI via grml-live running"
 
    if [ -r /etc/resolv.conf ] ; then
-     if [ -r /etc/resolvconf/run/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
+   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
@@ -36,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 -y safe-upgrade
+      else
+         $ROOTCMD aptitude -y upgrade
+      fi
+   else
+      $ROOTCMD apt-get -y upgrade
+   fi
 
 else # no softupdate but fresh installation