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
/
34-hosts
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
index
d943534
..
0b02c35
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/34-hosts
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/34-hosts
@@
-11,7
+11,7
@@
set -e
HOSTNAME=''
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
HOSTNAME=''
[ -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"
[ -n "$HOSTNAME" ] || HOSTNAME=grml
fcopy -v /etc/hosts
[ -n "$HOSTNAME" ] || HOSTNAME=grml
fcopy -v /etc/hosts