fixed typo and issue with var-name

This commit is contained in:
Matthias Strubel 2013-10-23 21:11:12 +02:00
parent 24fdcc6805
commit 8fe10fe646
2 changed files with 5 additions and 4 deletions

View file

@ -190,9 +190,10 @@ generate_dnsmasq $NET $IP_SHORT $START_LEASE $END_LEASE $LEASE_DURATION $DNSM
generate_lighttpd_env $GLOBAL_CHAT "$GLOBAL_DEST" $PIRATEBOX_PYTHONPATH $GEN_CHATFILE $PIRATEBOX_FOLDER $CHATFILE
if [ "$NODE_CONFIG_ACTIVE" = "yes" ] ; then
echo "Appending local node-name hosts entry"
echo -n "Appending local node-name hosts entry"
if generate_node_name "$HOST" "$NODE_NAME" "$NODE_GEN" ; then
echo $NODE_GEN_OUTPUT $NODE_IPV6_IP" >> "$HOSTS_CONFIG
echo $NODE_GEN_OUTPUT
echo "$NODE_IPV6_IP $NODE_GEN_OUTPUT " >> $HOSTS_CONFIG
else
echo "Error: No valid node-name-config found, skipping"
fi

View file

@ -16,14 +16,14 @@ generate_node_name() {
local complete_node_name=$in_node_name"."$in_host
if [ "$in_node_gen" = "no" ] : then
if [ "$in_node_gen" = "no" ] ; then
complete_node_name=$in_node_name
fi
if [ "$in_node_name" = "" ] ; then
complete_node_name=$in_host
fi
if [ "$complete_node_name" != "" ] ; then
export NODE_GEN_OUTPUT=$output_name
export NODE_GEN_OUTPUT=$complete_node_name
return 0
else
echo "Error: No valid node-name found"