Upgrade via aptitude upgrade in update process

diff --git a/debian/changelog b/debian/changelog
index ce6883e..5819699 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ grml-live (0.0.8) unstable; urgency=low
     softupdate action.
   * Remove /var/log/fai/* in class RELEASE.
   * Generate md5sum of windows binaries.
     softupdate action.
   * Remove /var/log/fai/* in class RELEASE.
   * Generate md5sum of windows binaries.

+  * Upgrade via aptitude upgrade in update process.

 
  -- Michael Prokop <mika@grml.org>  Sun, 04 Nov 2007 01:43:06 +0100
 
 
  -- Michael Prokop <mika@grml.org>  Sun, 04 Nov 2007 01:43:06 +0100
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 447b40e..bd21e7e 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.
 # 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:21:02 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:36:25 CET 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u


@@ -40,7 +40,13 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
       cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
    fi
 
       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
    $ROOTCMD apt-get update

+   if [ -x $target/usr/bin/aptitude ] ; then
+      $ROOTCMD aptitude upgrade
+   else
+      $ROOTCMD apt-get upgrade
+   fi

 
 else # no softupdate but fresh installation
 
 
 else # no softupdate but fresh installation