From: Michael Prokop <devnull@localhost>
Date: Sun, 4 Nov 2007 13:38:06 +0000 (+0100)
Subject: Upgrade via aptitude [safe-]upgrade
X-Git-Tag: 0.0.8~15
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=14e56253bc02d4b362856a282915d03737441963

Upgrade via aptitude [safe-]upgrade
---

diff --git a/debian/changelog b/debian/changelog
index bf0020e..281c854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ grml-live (0.0.8) unstable; urgency=low
     softupdate action.
   * Remove /var/log/fai/* in class RELEASE.
   * Generate md5sum of windows binaries.
-  * Upgrade via aptitude upgrade in update process.
+  * Upgrade via aptitude [safe-]upgrade in update process.
   * Rename /etc/grml/fai/grml/grml_cleanup_chroot.no_online into
     /etc/grml/fai/grml/grml_cleanup_chroot.online
   * Purge removed packages via /etc/grml/fai/grml/grml_cleanup_chroot
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index bd21e7e..1b97e9b 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:36:25 CET 2007 [mika]
+# Latest change: Sun Nov 04 14:37:26 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -43,7 +43,11 @@ 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 $target/usr/bin/aptitude --help | grep safe-upgrade ; then
+         $ROOTCMD aptitude safe-upgrade
+      else
+         $ROOTCMD aptitude upgrade
+      fi
    else
       $ROOTCMD apt-get upgrade
    fi