From 1df19dabd733a9b7b5587efe51358a0b868df0d3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 8 Jul 2009 01:51:27 +0200 Subject: [PATCH] Do not adjust mydestination and myhostname in /etc/postfix/main.cf --- chroot-script | 2 -- debian/changelog | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/chroot-script b/chroot-script index abfad4b..d8b8fb6 100755 --- a/chroot-script +++ b/chroot-script @@ -357,8 +357,6 @@ hostname() { if [ -r /etc/postfix/main.cf ] ; then # adjust hostname related options: sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf - sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf - sed -i "s/^mydestination = .*/mydestination = localdomain, localhost, localhost.localdomain, $HOSTNAME/" /etc/postfix/main.cf # listen on loopback interface only: sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf diff --git a/debian/changelog b/debian/changelog index c29578f..445ee52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,18 @@ grml-debootstrap (0.29) UNRELEASED; urgency=low + The "thanks to gebi for the bugreports and feedback" release. :) * Install busybox in kernel stage to be able to debug initramfs - problems (thanks, gebi). + problems. * Check whether we are installing into a directory in stage mkfs so we don't skip if the target is already mounted. * Mention "default: lenny" instead of "default: stable" in help - text as "stable" is invalid. Thanks, gebi. - * Use 'pri=0' as example for swap partition in /etc/fstab (thanks, - gebi). + text as "stable" is invalid. + * Use 'pri=0' as example for swap partition in /etc/fstab. + * Do not adjust mydestination and myhostname in /etc/postfix/main.cf as + mydestination defaults to "$myhostname, localhost.$mydomain, localhost", + myhostname defaults to gethostname() and mydomain to localdomain. - -- Michael Prokop Wed, 08 Jul 2009 01:41:46 +0200 + -- Michael Prokop Wed, 08 Jul 2009 01:48:13 +0200 grml-debootstrap (0.28) unstable; urgency=low -- 2.1.4