projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.grml.org:grml-live
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
05-hostname
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
index
ce91001
..
0d52914
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/05-hostname
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/05-hostname
@@
-9,10
+9,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"
# the hostname of the chroot usually isn't the same as the one for the live-system
BUILD_HOSTNAME="$($ROOTCMD hostname)"
# the hostname of the chroot usually isn't the same as the one for the live-system
BUILD_HOSTNAME="$($ROOTCMD hostname)"