X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F34-hosts;h=5ee9c760246ffb31ca79be05435f9f11f3e2deb7;hb=acc4adfadf97aa83811c9bf8cd3ef52a5de985c8;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..5ee9c76 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts +++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts @@ -11,7 +11,8 @@ 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