Merge remote-tracking branch 'origin/github/pr/148'

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 05-hostname

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
index ce91001..cf55d8d 100755 (executable)
--- 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
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -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)"
@@ -32,9 +29,5 @@ if [ -r $target/etc/postfix/main.cf ] ; then
   $ROOTCMD newaliases
 fi
 
-if [ -r $target/etc/bacula/bacula-fd.conf ] ; then
-  sed -i "s/$BUILD_HOSTNAME/$HOSTNAME/g" $target/etc/bacula/bacula-fd.conf
-fi
-
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2