projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unifiy local config handling
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
37-portmap
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
b/etc/grml/fai/config/scripts/GRMLBASE/37-portmap
index
16ef06a
..
fa84e56
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/37-portmap
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/37-portmap
@@
-10,7
+10,7
@@
set -u
set -e
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
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
# Work around a bug in the portmap package, see
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=317358