X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=5e543f28da5e2649323e147662a154b409e2407d;hp=404f1ebcda52447d5d82c2fff91d74c83115a93e;hb=55b6f63b136105fdf7773216d8375e6d265bcb55;hpb=a467b0ac5b82855ef5b41a708cf8ad9a25fa9d17 diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 404f1eb..5e543f2 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 # 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 23:18:56 CEST 2007 [mika] +# Latest change: Sat Oct 27 02:15:35 CEST 2007 [mika] ################################################################################ set -u @@ -12,22 +12,27 @@ 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"; // 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 -#$ROOTCMD aptitude -f -y install apt-listbugs -#if [ -r $target/etc/apt/apt.conf.d/10apt-listbugs ] ; then -# mv $target/etc/apt/apt.conf.d/10apt-listbugs $target/etc/apt/apt.conf.d/10apt-listbugs.disabled -#fi +# 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: