X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F05-hostname;h=cf55d8dea50a92a264a2ddb50e5298efdbfe4b38;hp=0b0fe1790f0d4bda2e8b6cefbb403c6af39ff6ad;hb=HEAD;hpb=2def18e419f1474c3904672ce297babbb4b9b501

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
index 0b0fe17..cf55d8d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
+++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/05-hostname
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/05-hostname
 # Purpose:       set hostname of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -9,11 +9,14 @@
 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)"
+[ -n "$BUILD_HOSTNAME" ] || BUILD_HOSTNAME="grml"
+
 echo "$HOSTNAME" > $target/etc/hostname
+echo "$HOSTNAME" > $target/etc/mailname
 
 if [ -r $target/etc/postfix/main.cf ] ; then
   sed -i "s/^mydestination = .*/mydestination = $HOSTNAME, localhost, localhost.localdomain/" $target/etc/postfix/main.cf
@@ -21,7 +24,10 @@ if [ -r $target/etc/postfix/main.cf ] ; then
   echo "postfix postfix/mailname     string $HOSTNAME" | $ROOTCMD debconf-set-selections
   echo "postfix postfix/destinations string ${HOSTNAME}, localhost.grml.org, localhost" \
   | $ROOTCMD debconf-set-selections
+  # make sure to execute newaliases after adjusting configuration,
+  # otherwise the old hostname will be left inside /etc/aliases.db
+  $ROOTCMD newaliases
 fi
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2