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 715888c..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 Dec 16 18:31:59 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -57,14 +56,18 @@ 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
@@ -91,6 +94,7 @@ 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: