X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F05-hostname;h=ce91001c1294a853efbcf8a961d177567e952652;hp=4751eccbf12a4e8c422b2089e928a26aadb7b5df;hb=9dafaad2fe959f195d68a38655f60d00ee028256;hpb=5a215cd1ae58656569a9e7704c20d0a784eb83c6 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname index 4751ecc..ce91001 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname +++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname @@ -11,7 +11,7 @@ set -e HOSTNAME='' [ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf -[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local +[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG" [ -n "$HOSTNAME" ] || HOSTNAME=grml # the hostname of the chroot usually isn't the same as the one for the live-system