update to upstream 5.3.4

[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 bd9c3be892f27dea8c6aeeba99e662efff430e87..00a1df2467b336e46bfc9806aa891207477ebb05 100755 (executable)
--- a/fai/config/hooks/setup.DEFAULT.sh
+++ b/fai/config/hooks/setup.DEFAULT.sh
@@ -2,10 +2,6 @@
 
 # use short hostname instead of FQDN
 export HOSTNAME=${HOSTNAME%%.*}
-# n.b. use $action instead of $FAI_ACTION
-# as the latter is apparently unset at this point in dirinstall
-if [ "$action" = "dirinstall" ] ; then
-  :
-else
+if [ $do_init_tasks -eq 1 ]; then
   echo $HOSTNAME > /proc/sys/kernel/hostname
 fi