X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F37-portmap;h=d7a426c29c910194364aa223a9ad5cfb2fddf970;hp=4dc5e3dae9135bf96cfebc8290f0b38e3b9eb5c1;hb=40b0557155a1203823d820af0b7bef21af037cd2;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
index 4dc5e3d..d7a426c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
+++ b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
@@ -9,14 +9,12 @@
 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
-
 # 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,21 +23,6 @@ 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 #################################################################