Restore old upgrade behaviour inside instsoft script

diff --git a/debian/changelog b/debian/changelog
index b9b8c64..df05995 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ grml-live (0.0.10) unstable; urgency=low
     - LOGDIR is /tmp/fai during an installation (not dirinstall), and
       will be copied to the path above at the end of an installation
   * Log the executed FAI command line to /var/log/grml-live.log.
     - LOGDIR is /tmp/fai during an installation (not dirinstall), and
       will be copied to the path above at the end of an installation
   * Log the executed FAI command line to /var/log/grml-live.log.

-  * No longer update chroot system via instsoft.GRMLBASE as FAI
-    should do that now.

   * New option '-C <configuration_file>' for specifying a configuration
     file. Needs heavy testing though, because the files are updated
     during runtime it isn't as easy as expected to be. :-/
   * New option '-C <configuration_file>' for specifying a configuration
     file. Needs heavy testing though, because the files are updated
     during runtime it isn't as easy as expected to be. :-/

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 7a67f99..0503311 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -57,12 +57,26 @@ EOF
       fi
    fi
 
       fi
    fi
 

+   # FAI softupdate executes upgrade only with the sources.list being
+   # present in the chroot :-/ - so let's do it on our own:

    if [ -r /etc/grml/fai/apt/sources.list ] ; then
       if [ -L $target/etc/apt/sources.list ] ; then
          rm $target/etc/apt/sources.list
       fi
       cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
    fi
    if [ -r /etc/grml/fai/apt/sources.list ] ; then
       if [ -L $target/etc/apt/sources.list ] ; then
          rm $target/etc/apt/sources.list
       fi
       cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
    fi

+
+   $ROOTCMD apt-get update
+   if [ -x $target/usr/bin/aptitude ] ; then
+      if $ROOTCMD aptitude --help | grep -q safe-upgrade ; 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
 
 # work around http://trac.lighttpd.net/trac/ticket/657
 else # no softupdate but fresh installation
 
 # work around http://trac.lighttpd.net/trac/ticket/657