projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename "readonly" boot option to "read-only", renamed in live-boot
[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
0b02c35
..
a08c3b9
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/34-hosts
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/34-hosts
@@
-8,11
+8,7
@@
set -u
set -e
set -u
set -e
-
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
+. "$GRML_LIVE_CONFIG"
fcopy -v /etc/hosts
fcopy -v /etc/hosts