summaryrefslogtreecommitdiff
path: root/experiment/scripts/setup.sh
diff options
context:
space:
mode:
authorBoss Marco <bossm8@bfh.ch>2022-05-17 18:38:58 +0200
committerBoss Marco <bossm8@bfh.ch>2022-05-17 18:38:58 +0200
commitdfc8781f01818014807da54c34f08be9aa07524b (patch)
tree4c4d087327849b427339454ed1a1e1804f5617bb /experiment/scripts/setup.sh
parent38acd35fc7bec36a8d6a01fe90cdf378b33d49ed (diff)
downloadgrid5k-dfc8781f01818014807da54c34f08be9aa07524b.tar.gz
grid5k-dfc8781f01818014807da54c34f08be9aa07524b.tar.bz2
grid5k-dfc8781f01818014807da54c34f08be9aa07524b.zip
fix setup.sh
Diffstat (limited to 'experiment/scripts/setup.sh')
-rw-r--r--experiment/scripts/setup.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 65d2a2f..77137e6 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -57,7 +57,7 @@ function parse_experiment_nodes() {
)
echo "${NODE^^}_HOSTS=\"${NODES_STR}\"" >> ~/.env
- echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | awk -F '|' '{print NF}')" >> ~/.env
+ echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | grep -v "none" | awk -F '|' '{print NF}')" >> ~/.env
done
# Export NODE_NAME, which can be used to set log directories for example
@@ -214,7 +214,7 @@ function clean_previous_setup() {
clean_previous_setup
# Check if binaries need to be rebuilt on debian based operating systems
if ! grep -q "Red Hat" /proc/version; then
- source ~/scripts/install.sh &
+ source ~/scripts/install.sh
fi
parse_experiment_nodes
setup_log_dir
@@ -222,8 +222,6 @@ setup_environment
setup_config
setup_dns
-wait
-
if ! grep -q "Red Hat" /proc/version; then
# Only works in debian based operating systems
exec ~/scripts/createusers.sh