diff options
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-hostconfig | 8 | ||||
| -rwxr-xr-x | testing/scripts/start-switches | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/testing/scripts/build-hostconfig b/testing/scripts/build-hostconfig index 1dd268719..0c2afd2c2 100755 --- a/testing/scripts/build-hostconfig +++ b/testing/scripts/build-hostconfig @@ -83,8 +83,12 @@ do searchandreplace PH_IP6_SUN $ipv6_sun $HOSTCONFIGDIR ;; alice) - searchandreplace PH_IP_ALICE $ipv4_alice $HOSTCONFIGDIR - searchandreplace PH_IP6_ALICE $ipv6_alice $HOSTCONFIGDIR + eval ipv4_alice1="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`" + searchandreplace PH_IP_ALICE1 $ipv4_alice1 $HOSTCONFIGDIR + searchandreplace PH_IP_ALICE $ipv4_alice $HOSTCONFIGDIR + eval ipv6_alice1="`echo $HOSTNAMEIPV6 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $2 }' | awk '{ print $1 }'`" + searchandreplace PH_IP6_ALICE1 $ipv6_alice1 $HOSTCONFIGDIR + searchandreplace PH_IP6_ALICE $ipv6_alice $HOSTCONFIGDIR ;; venus) searchandreplace PH_IP_VENUS $ipv4_venus $HOSTCONFIGDIR diff --git a/testing/scripts/start-switches b/testing/scripts/start-switches index c9cafafc1..aab82b8ff 100755 --- a/testing/scripts/start-switches +++ b/testing/scripts/start-switches @@ -31,7 +31,7 @@ do cecho " * Great, umlswitch$n is already running!" else cecho-n " * Starting umlswitch$n.." - uml_switch -tap tap$n -unix /tmp/umlswitch$n >/dev/null </dev/null & + uml_switch -tap tap$n -unix /tmp/umlswitch$n >/dev/null 2>&1 </dev/null & sleep 2 eval ifconfig "tap$n \$IFCONFIG_$n up" cecho "\033[1;32mdone" |