Use -y for upgrade in instsoft.GRMLBASE

[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 bd21e7e..2a00b39 100755 (executable)
--- 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:36:25 CET 2007 [mika]
+# Latest change: Sun Nov 04 14:37:26 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -43,9 +43,13 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    # 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
-      $ROOTCMD aptitude upgrade
+      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 upgrade
+      $ROOTCMD apt-get -y upgrade
    fi
 
 else # no softupdate but fresh installation