X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F34-hosts;h=961fc5c9e386e594d0e8a2bdc1e9af4cfd970442;hb=574c42b5cbb9d1264b84bade255aed42547db8ec;hp=1363b959b5e5d917765c76ec9c829e5be7529dbb;hpb=02b32aa7fe4022fdefc80552539ecba4f1067492;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
index 1363b95..961fc5c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
+++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
@@ -4,19 +4,17 @@
 # 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: Sat Oct 06 12:35:30 CEST 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
 HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
-if [ -r /etc/grml/fai/files/etc/hosts ] ; then
-   cp /etc/grml/fai/files/etc/hosts $target/etc/hosts
-fi
+fcopy /etc/hosts
 
 # replace $HOSTNAME with the real hostname:
 sed -i "s/\$HOSTNAME/$HOSTNAME/" $target/etc/hosts