From f8d2fa05f607bf4440317c21ea0858d78b26891d Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Sat, 13 Oct 2007 18:04:25 +0200
Subject: [PATCH] Add new scripts for retreiving bugs via apt-listbugs and
 storing package selection

---
 debian/changelog                                   |  3 +++
 etc/grml/fai/config/hooks/instsoft.GRMLBASE        |  2 +-
 .../config/scripts/GRMLBASE/95-package-information | 22 +++++++++++++++++++++
 .../fai/config/scripts/GRMLBASE/96-apt-listbugs    | 23 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100755 etc/grml/fai/config/scripts/GRMLBASE/95-package-information
 create mode 100755 etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs

diff --git a/debian/changelog b/debian/changelog
index fe386f9..1098037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ grml-live (0.0.5) unstable; urgency=low
     - grml-live_autobuild_grml64-small_sid.sh
   * Some more FAI error checking.
   * Update buildd scripts (better subject handling).
+  * Re-enable 'Acquire::http::Pipeline-Depth' workaround'
+  * Add new scripts for retreiving bugs via apt-listbugs
+    and storing package selection inside log directory.
   * Add new packages to GRML_FULL:
     - ack-grep
     - mailplate
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 5556f7c..fe8ad47 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -12,7 +12,7 @@ set -e
 
 # work around http://trac.lighttpd.net/trac/ticket/657
 # should be removed later on:
-# echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf
+echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf
 
 # install grml keys:
 gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
new file mode 100755
index 0000000..902bc07
--- /dev/null
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+# Purpose:       store package information of chroot system
+# 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: Sat Oct 13 17:48:38 CEST 2007 [mika]
+################################################################################
+
+HOSTNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+
+if [ -x $target/usr/bin/dpkg-query ] ; then
+   $ROOTCMD dpkg-query -W --showformat='${Package}\t${Installed-Size;10}\n' > \
+   /var/log/fai/dirinstall/$HOSTNAME/packages.size
+fi
+
+$ROOTCMD COLUMNS=200 dpkg --list > /var/log/fai/dirinstall/$HOSTNAME/dpkg.list
+$ROOTCMD COLUMNS=200 dpkg --get-selections > /var/log/fai/dirinstall/$HOSTNAME/dpkg.selections
+
+## END OF FILE #################################################################
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
new file mode 100755
index 0000000..19c6844
--- /dev/null
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+# Purpose:       retreive list of bugreports of installed packages inside chroot
+# 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: Sat Oct 13 18:03:15 CEST 2007 [mika]
+################################################################################
+
+HOSTNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+
+if [ -x $target/usr/sbin/apt-listbugs ] ; then
+   for severity in critical grave serious ; do
+       apt-listbugs -s $severity list $(apt-show-source | \
+       grep -v -e 'not installed' -e '--------------' -e 'Version' | \
+       awk '{print $4;}' | grep -v '^[() ]*$'| sort | uniq) \
+       /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity}
+   done
+fi
+
+## END OF FILE #################################################################
-- 
2.1.4