Move cleanup of package list cache from GRMLBASE to RELEASE

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index d36013c..f808c65 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -41,15 +41,8 @@ if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-echo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
-rm -f $target/var/lib/apt/lists/*Packages \
-      $target/var/lib/apt/lists/*Release \
-      $target/var/lib/apt/lists/*Sources \
-      $target/var/lib/apt/lists/*IndexDiff \
-      $target/var/lib/apt/lists/*.gpg \
-      $target/var/cache/apt-show-versions/* \
-      $target/var/cache/debconf/templates.dat-old \
-      $target/var/cache/apt/*.bin
+echo "Updating package list"
+$ROOTCMD apt-get update
 
 echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null

diff --git a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
index d89f5de..d65e992 100755 (executable)
--- a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
@@ -9,6 +9,17 @@
 set -u
 set -e
 
+
+echo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
+rm -f $target/var/lib/apt/lists/*Packages \
+      $target/var/lib/apt/lists/*Release \
+      $target/var/lib/apt/lists/*Sources \
+      $target/var/lib/apt/lists/*IndexDiff \
+      $target/var/lib/apt/lists/*.gpg \
+      $target/var/cache/apt-show-versions/* \
+      $target/var/cache/debconf/templates.dat-old \
+      $target/var/cache/apt/*.bin
+
 # Remove all FAI logs from chroot via grml-live later then
 echo "Setting up /etc/grml_fai_release for grml-live"
 touch $target/etc/grml_fai_release