summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-21 13:14:39 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-21 13:14:39 +0100
commit5b90e6cc436806396537c689d1c1a469ced9c75b (patch)
tree6573ece0112bb7a12ffbac86a8cf408f3c773841
parent512cfa7dde2c21f675d6dcf237749dfb61121f16 (diff)
Parameterise -boot argument to run_erl.
Less duplication.
-rwxr-xr-xcatlfish-dev/start.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index f28b367..9265210 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -22,10 +22,7 @@ ln -s ${nodename}/${nodename}.config
case $role in
frontend|storage|signing)
- $erlbase/bin/run_erl \
- /var/run/catlfish/ \
- /var/run/catlfish/erlang_log/ \
- "exec $erlbase/bin/erl -config $nodename"
+ boot=catlfish
;;
merge)
@@ -33,12 +30,16 @@ case $role in
$erlbase/merge.sh ${logname} ${nodename} \
> merge_log/stdout \
2> merge_log/stderr &
- $erlbase/bin/run_erl \
- /var/run/catlfish/ \
- /var/run/catlfish/erlang_log/ \
- "exec $erlbase/bin/erl -boot merge -config $nodename"
+ boot=merge
;;
+
*)
echo "catlfish: unknown role: $role"
+ exit 1
;;
esac
+
+$erlbase/bin/run_erl \
+ /var/run/catlfish/ \
+ /var/run/catlfish/erlang_log/ \
+ "exec $erlbase/bin/erl -boot $boot -config $nodename"