X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F05-hostname;h=0d529146b9a80bb025461a0d733da59f2ee070fe;hb=8d91fa8e1b3b6d46a1333928a7384a463868cce0;hp=4751eccbf12a4e8c422b2089e928a26aadb7b5df;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;p=grml-live.git diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname index 4751ecc..0d52914 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname +++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname @@ -9,10 +9,7 @@ set -u 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 "$HOSTNAME" ] || HOSTNAME=grml +. "$GRML_LIVE_CONFIG" # the hostname of the chroot usually isn't the same as the one for the live-system BUILD_HOSTNAME="$($ROOTCMD hostname)"