Drop skiptask updatebase but re-enable /etc/grml/fai/apt/sources.list

diff --git a/debian/changelog b/debian/changelog
index 879b58c..4ca8ba3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ grml-live (0.9.5) unstable; urgency=low
     [Closes: issue552]
   * Drop xserver-xorg-video-newport from all flavours.
   * Replace all unzoo package references with zoo, see #497775.
-  * Drop the /etc/grml/fai/apt/sources.list workaround for softupdate for now.
+  * Drop 'skiptask updatebase' workaround in
+    /etc/grml/fai/config/hooks/updatebase.GRMLBASE.
 
  -- Michael Prokop <mika@grml.org>  Wed, 15 Oct 2008 23:20:54 +0200
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index ad9f199..e5d5452 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -56,18 +56,14 @@ 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

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index d50e600..933bb8c 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -7,11 +7,12 @@
 ################################################################################
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   # we want to use our own sources.list:
+
+   ## we want to use our own sources.list:
    # skiptask updatebase
 
-   # make sure we don't start any daemons - removed
-   # later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+   ## make sure we don't start any daemons - removed
+   ## later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
 #   if ! [ -r $target/usr/sbin/policy-rc.d ] ; then
 #      cat > $target/usr/sbin/policy-rc.d << EOF
 ##!/bin/sh