From: Alexander Wirt <formorer@debian.org>
Date: Wed, 28 Dec 2011 20:58:26 +0000 (+0100)
Subject: Merge branch 'master' of git.grml.org:grml-live
X-Git-Tag: v0.17.3~12
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=89cdf10f27a3ffcb6846ae5aa5e51cb9e5010738;hp=6225bfa01f4dfc21710f47372c05e8ed2031480e;p=grml-live.git

Merge branch 'master' of git.grml.org:grml-live
---

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index d685f03..9b2d57d 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -151,10 +151,12 @@ ethstatus
 ethtool
 firmware-brcm80211
 firmware-iwlwifi
+firmware-qlogic
 firmware-ralink
 firmware-realtek
 ifupdown
 ipcalc
+ipmitool
 iproute
 iptraf
 iputils-arping
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
--- 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..056f6a4 100755
--- 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/*Index* \
+      $target/var/lib/apt/lists/*.gpg \
+      $target/var/cache/apt-show-versions/* \
+      $target/var/cache/debconf/*.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