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

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index e4449d8..1e5ce06 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,31 +4,106 @@
 # 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 Sep 16 22:53:02 CEST 2007 [mika]
+# Latest change: Sun Nov 04 14:37:26 CET 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
+# visualize chroot inside zsh:
+echo grml_chroot > $target/etc/debian_chroot
+
+if [ "$FAI_ACTION" = "softupdate" ] ; then
+   echo "Softupdate of FAI via grml-live running"
+
+   if [ -r /etc/resolv.conf ] ; then
+     if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+        cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+     else
+        cat /etc/resolv.conf >> $target/etc/resolv.conf
+     fi
+   fi
+
+   if [ -r $target/etc/policy-rc.d.conf ] ; then
+      sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
+   fi
+
+   # make sure we prefer grml repository:
+   if [ -r /etc/grml/fai/apt/preferences ] ; then
+      cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
+   fi
+
+   if [ -r /etc/grml/fai/apt/sources.list ] ; then
+      if [ -L $target/etc/apt/sources.list ] ; then
+         rm $target/etc/apt/sources.list
+      fi
+      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+   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
+      if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
+         $ROOTCMD aptitude safe-upgrade
+      else
+         $ROOTCMD aptitude upgrade
+      fi
+   else
+      $ROOTCMD apt-get upgrade
+   fi
+
+else # no softupdate but fresh installation
+
 # 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"; // added by grml-live" >> $target/etc/apt/apt.conf
+
+# Recommends just pull in way tooooo much packages, so disable it:
+echo "APT::Install-Recommends "false"; // added by grml-live"   >> $target/etc/apt/apt.conf
 
 # install grml keys:
-gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
+gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \
+gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
 gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
 $ROOTCMD apt-key add /etc/apt/grml.key
 
+# make sure we prefer grml repository:
+if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
+   cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
+fi
+
 # make sure we have file-rc available before
 # package_config/GRML is being executed:
 $ROOTCMD apt-get update
 $ROOTCMD aptitude -f -y install file-rc
 
+# Workaround #443481 of snort for Debian/etch:
+mkdir -p $target/etc/snort
+echo 'LOGDIR=/var/log/snort' >> $target/etc/snort/snort.common.parameters
+
+# we definitely don't want to fail running fai dirinstall 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 /dev/MAKEDEV is available:
+if [ -x "$target"/sbin/MAKEDEV ] && ! [ -r "$target"/dev/MAKEDEV ] ; then
+   ln -s /sbin/MAKEDEV "$target"/dev/MAKEDEV
+fi
+
 # we don't need the invoke-rc.d.d diversion (we have grml-policyrcd :)):
 if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then
    rm -f "$target"/usr/sbin/invoke-rc.d
    $ROOTCMD dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d
 fi
 
+fi # end of FAI_ACTION = softupdate
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3