X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=ac85fd9b1f6f07ded01171fe5d94a8f57bafa1e0;hb=69bd31ca5e652942465995e320b7852fc5cf2a06;hp=1e5ce06442cdfe47d1b92d60dac57e77ba42e3aa;hpb=7fa9c329d85bf44b690aa7457597e3acee0633de;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 1e5ce06..ac85fd9 100755
--- 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 12 11:14:32 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -33,6 +33,24 @@ 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
+
+   # make sure we can handle kernel upgrades:
+   if [ -r $target/etc/kernel-img.conf ] ; then
+      if ! grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then
+         echo "silent_modules = Yes" >> $target/etc/kernel-img.conf
+      fi
+   fi
+
    if [ -r /etc/grml/fai/apt/sources.list ] ; then
       if [ -L $target/etc/apt/sources.list ] ; then
          rm $target/etc/apt/sources.list
@@ -44,12 +62,12 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    $ROOTCMD apt-get update
    if [ -x $target/usr/bin/aptitude ] ; then
       if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
-         $ROOTCMD aptitude safe-upgrade
+         $ROOTCMD aptitude -y safe-upgrade
       else
-         $ROOTCMD aptitude upgrade
+         $ROOTCMD aptitude -y upgrade
       fi
    else
-      $ROOTCMD apt-get upgrade
+      $ROOTCMD apt-get -y upgrade
    fi
 
 else # no softupdate but fresh installation