Adjust 95-package-information for new log layout

[grml-live.git] / etc / grml / fai / config / hooks / instsoft.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index bd21e7e..1580f38 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 11:36:25 CET 2007 [mika]
+# Latest change: Mon Nov 12 11:14:32 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -13,6 +13,11 @@ set -e
 # visualize chroot inside zsh:
 echo grml_chroot > $target/etc/debian_chroot
 
+HOSTNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -n "$HOSTNAME" ] || HOSTNAME=grml
+echo "$HOSTNAME" > $target/etc/hostname
+
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Softupdate of FAI via grml-live running"
 
@@ -33,6 +38,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
@@ -41,12 +64,16 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    fi
 
    # FAI softupdate does not execute upgrade, so let's do it on our own:
-   $ROOTCMD apt-get update
-   if [ -x $target/usr/bin/aptitude ] ; then
-      $ROOTCMD aptitude upgrade
-   else
-      $ROOTCMD apt-get upgrade
-   fi
+#   $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 -y safe-upgrade
+#      else
+#         $ROOTCMD aptitude -y upgrade
+#      fi
+#   else
+#      $ROOTCMD apt-get -y upgrade
+#   fi
 
 else # no softupdate but fresh installation