X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=ad9f1994a3b950a6e5a6a9eac6190315edadfbbf;hb=c8546cb8d8d0870c6993343a7b5cfe27694cbf4e;hp=ecf677239e01cc50330c902bcf3fea3d33e1c15e;hpb=1227c08ee615f11dcd8566b0408045eae2525522;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index ecf6772..ad9f199 100755
--- 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
@@ -57,18 +56,26 @@ EOF
       fi
    fi
 
+   # 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
+#   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
@@ -87,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 || \