X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F37-portmap;h=fa84e566fe8be55c8fb0f779d9d7fa1479bc7d01;hb=9dafaad2fe959f195d68a38655f60d00ee028256;hp=003869f728fea21c28d27fb3284d183c37eb18b1;hpb=db3c3de8321d794979493c9df2b01f200e9a468e;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
index 003869f..fa84e56 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
+++ b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/37-portmap
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/37-portmap
 # Purpose:       configure portmap of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -10,13 +10,14 @@ set -u
 set -e
 
 [ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
 
 # Work around a bug in the portmap package, see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=317358
 
 CONFFILE="$target/etc/default/portmap"
 
+# modify only if the file is present, nowadays we have rpcbind
 if [ -r "$CONFFILE" ] ; then
  # modify it iff we have portmap's default configuration
  if grep -q '^OPTIONS="-i 127.0.0.1"' "$CONFFILE" ; then
@@ -25,22 +26,7 @@ if [ -r "$CONFFILE" ] ; then
    printf "Removing loopback-interface-only option (workaround #317358) in /etc/default/portmap: "
    sed -i 's/^OPTIONS.*/# OPTIONS="-i 127.0.0.1"/' "$CONFFILE" && echo OK || echo ERROR
  fi
-else # no /etc/default/portmap available yet:
- printf "Building fresh /etc/default/portmap configuration file."
- cat > "$CONFFILE" << EOF
-# Portmap configuration file
-#
-# Note: if you manually edit this configuration file,
-# portmap configuration scripts will avoid modifying it
-# (for example, by running 'dpkg-reconfigure portmap').
-
-# If you want portmap to listen only to the loopback
-# interface, uncomment the following line (it will be
-# uncommented automatically if you configure this
-# through debconf).
-# OPTIONS="-i 127.0.0.1"
-EOF
 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