iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix bad merge of upstream config
[automated-distro-installer]
/
fai
/
config
/
hooks
/
setup.DEFAULT.sh
diff --git
a/fai/config/hooks/setup.DEFAULT.sh
b/fai/config/hooks/setup.DEFAULT.sh
index 711fa7f766a0a56866f0643a6cfe627d6587797b..00a1df2467b336e46bfc9806aa891207477ebb05 100755
(executable)
--- a/
fai/config/hooks/setup.DEFAULT.sh
+++ b/
fai/config/hooks/setup.DEFAULT.sh
@@
-2,4
+2,6
@@
# use short hostname instead of FQDN
export HOSTNAME=${HOSTNAME%%.*}
-echo $HOSTNAME > /proc/sys/kernel/hostname
+if [ $do_init_tasks -eq 1 ]; then
+ echo $HOSTNAME > /proc/sys/kernel/hostname
+fi