Do not use build server's hostname for /etc/mailname + /etc/bacula/bacula-fd.conf.

diff --git a/debian/changelog b/debian/changelog
index ac3e372..7dd24c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,10 @@ grml-live (0.9.9) unstable; urgency=low
     in grml-autoconfig anyway and this shortens our /proc/cmdline.
   * Run commands requiring network access through 'timeout 10' by default
     if possible. [Closes: issue396]
+  * Do not use build server's hostname for /etc/mailname and
+    /etc/bacula/bacula-fd.conf. [Testing: issue412]
 
- -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 17:47:11 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 17:54:41 +0100
 
 grml-live (0.9.8) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
index 0b0fe17..55dfaea 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
+++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
@@ -13,7 +13,13 @@ 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
+
+# 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
@@ -23,5 +29,9 @@ if [ -r $target/etc/postfix/main.cf ] ; then
   | $ROOTCMD debconf-set-selections
 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=3