# 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: Mon Nov 19 12:49:27 CET 2007 [mika]
+# Latest change: Sun Dec 16 17:18:14 CET 2007 [mika]
################################################################################
set -e
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
- if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+ if [ -d $target/etc/resolvconf/run ] ; then
cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
- else
+ elif [ ! -L $target/etc/resolv.conf ] ; then
cat /etc/resolv.conf >> $target/etc/resolv.conf
fi
fi
[ -x $target/etc/apt/grml/listbugs ] ; then
for severity in critical grave serious ; do
SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
- /var/log/fai/dirinstall/$HOSTNAME/bugs.${severity} || true # make sure it does not fail
+ /var/log/fai/$HOSTNAME/last/bugs.${severity} || true # make sure it does not fail
done
fi