Addd hdapsd + hdaps-utils to GRML_FULL; disable apt-listbugs in [soft]update

diff --git a/debian/changelog b/debian/changelog
index 76bb3f6..bc28792 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 grml-live (0.0.9) unstable; urgency=low
 
   * Remove all files inside /root/ when using class RELEASE.
+  * Disable apt-listbugs in [soft]update.
+  * Add new packages to GRML_FULL:
+    - hdapsd
+    - hdaps-utils
 
  -- Michael Prokop <mika@grml.org>  Mon, 05 Nov 2007 22:37:11 +0100
 

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 2a00b39..15093e4 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,7 @@
 # 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 Nov 04 14:37:26 CET 2007 [mika]
+# Latest change: Mon Nov 05 22:48:02 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -33,6 +33,17 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
       cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
    fi
 
+   # we definitely don't want to fail running fai sofupdate just
+   # because of some well known bugs:
+   [ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d
+   cat > $target/etc/apt/apt.conf.d/10apt-listbugs << EOF
+// Check all packages whether they has critical bugs before they are installed.
+// If you don't like it, comment it out.
+//DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10"};
+//DPkg::Tools::Options::/usr/sbin/apt-listbugs "";
+//DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
+EOF
+
    if [ -r /etc/grml/fai/apt/sources.list ] ; then
       if [ -L $target/etc/apt/sources.list ] ; then
          rm $target/etc/apt/sources.list

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 2328f44..deadf3c 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -796,6 +796,8 @@ haproxy
 harden-remoteaudit
 harden-tools
 hasciicam
+hdapsd
+hdaps-utils
 hddtemp
 hdparm
 hexedit