Drop the /etc/grml/fai/apt/sources.list workaround for softupdate for now

[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 4d087e7..ad9f199 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,6 @@
 # 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 25 18:28:54 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -23,11 +22,11 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Softupdate of FAI via grml-live running"
 
    if [ -r /etc/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
+      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
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
@@ -57,12 +56,36 @@ EOF
       fi
    fi
 
-   if [ -r /etc/grml/fai/apt/sources.list ] ; then
-      if [ -L $target/etc/apt/sources.list ] ; then
-         rm $target/etc/apt/sources.list
+   # 081015: deactivated because it seems to be unnecessary for
+   #         stable release maintenance - keep the code for now
+   #         if we re-notice any problems
+   #
+   # 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
+
+   # run it on our own, as updatebase is used at the wrong stage for our needs,
+   # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE
+   $ROOTCMD apt-get update
+   if ! [ -x $target/usr/bin/aptitude ] ; then
+      $ROOTCMD apt-get -y install aptitude
+   fi
+
+   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
-      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+   else
+      $ROOTCMD apt-get -y upgrade
    fi
+
 else # no softupdate but fresh installation
 
 # work around http://trac.lighttpd.net/trac/ticket/657
@@ -71,6 +94,8 @@ echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/a
 
 # Recommends just pull in way tooooo much packages, so disable it:
 echo "APT::Install-Recommends "false"; // added by grml-live"   >> $target/etc/apt/apt.conf
+# Notice: deprecated since aptitude (0.4.11-1):
+echo "Aptitude::Recommends-Important "false"; // added by grml-live" >> $target/etc/apt/apt.conf
 
 # install grml keys:
 gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \