X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=c59f455d070fe439e4de145c8f491c33b9e03c25;hp=eaf39f666fcc274941d94c8baf977065202632fe;hb=35cefbcdbd6633223fea03a7c61b8b249813dfa3;hpb=4040ae3e3763818f6002af85aec8e9ed7c905c56

diff --git a/chroot-script b/chroot-script
index eaf39f6..c59f455 100755
--- a/chroot-script
+++ b/chroot-script
@@ -36,9 +36,11 @@ stage() {
      echo "$2" > "$STAGES/$1"
      return 0
   elif grep -q done "$STAGES/$1" 2>/dev/null ; then
-     echo "[*] Notice: stage $1 has been executed already, skipping execution therefore.">&2
+     echo "   [*] Notice: stage $1 has been executed already, skipping execution therefore.">&2
      return 1
   fi
+  echo "   Executing stage ${1}"
+  return 0
 }
 # }}}
 
@@ -47,10 +49,10 @@ chrootmirror() {
   [ -n "$KEEP_SRC_LIST" ] && return
   if [ -n "$ISO" ] ; then
      echo "deb $ISO $RELEASE main contrib" > /etc/apt/sources.list
-     [ -n "$CHROOTMIRROR" ] && echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list
+     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list
   else
-    if [ -n "$CHROOTMIRROR" ] ; then
-       echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
+    if [ -n "$MIRROR" ] ; then
+       echo "deb $MIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
     fi
   fi
 }
@@ -247,9 +249,25 @@ passwords()
 
 # set up /etc/hosts {{{
 hosts() {
-  if ! [ -f /etc/hosts ] ; then
-     echo "Setting up /etc/hosts"
-     echo "127.0.0.1       localhost  $HOSTNAME" > /etc/hosts
+  if [ -f /etc/hosts ] ; then
+     sed -i "s#127.0.0.1 .*#127.0.0.1       localhost  $HOSTNAME#" /etc/hosts
+     [ -n "$HOSTNAME" ] && sed -i "s/grml/$HOSTNAME/g" /etc/hosts
+  else
+     cat > /etc/hosts << EOF
+127.0.0.1       localhost $HOSTNAME
+
+#127.0.0.1       localhost
+#127.0.1.1       $HOSTNAME.example.org $HOSTNAME
+
+# The following lines are desirable for IPv6 capable hosts
+#::1     ip6-localhost ip6-loopback $HOSTNAME
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+EOF
   fi
 }
 # }}}
@@ -327,7 +345,14 @@ hostname() {
 
      # adjust postfix configuration
      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
+        grep -q inet_interfaces /etc/postfix/main.cf || echo 'inet_interfaces = loopback-only' >> /etc/postfix/main.cf
      fi
   fi
 }
@@ -429,12 +454,13 @@ finalize() {
 # execute the functions {{{
  for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
      packages extrapackages mkinitrd kernel reconfigure hosts interfaces   \
-     timezone fstab hostname initrd grub passwords custom_scripts \
-     services finalize ; do
+     timezone fstab hostname initrd grub passwords custom_scripts services ; do
      if stage $i ; then
        $i && stage $i done || exit 1
      fi
   done
+  # always execute the finalize stage:
+  finalize
 # }}}
 
 # finally exit the chroot {{{