projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: add vblade, aoetools to GRML_FULL [Closes: issue1092]
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
hooks
/
updatebase.GRMLBASE
diff --git
a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index
3a7b9af
..
7a79cbe
100755
(executable)
--- a/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@
-14,7
+14,7
@@
echo grml_chroot > $target/etc/debian_chroot
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
echo "$HOSTNAME" > $target/etc/hostname
[ -n "$HOSTNAME" ] || HOSTNAME=grml
echo "$HOSTNAME" > $target/etc/hostname