Commit 88691c21 authored by Robert Ricci's avatar Robert Ricci

Fix some problems with the auto* scripts waititing for their chidlren;

this means we should now be able to invoke them via the program agent.
parent ac33e3fd
......@@ -11,10 +11,10 @@ barrier_wait "stub";
#
# Start up our own monitor
#
MONPID=`log_output_background "monitor" \
"$SH ${MONITOR_DIR}/run-monitor-libnetmon.sh"`
$SH ${MONITOR_DIR}/run-monitor-libnetmon.sh &
MONPID=$!
# Kill the monitor if we get killed - TODO: harsher kill?
trap "$AS_ROOT kill $MONPID" EXIT
trap "$AS_ROOT kill $MONPID; $AS_ROOT killall netmond" EXIT
#
# Give it time to come up
......
......@@ -33,5 +33,5 @@ fi
echo "Generating IP mapping file into $IPMAP";
$PERL ${MONITOR_DIR}/$GENIPMAP > $IPMAP
echo "Starting up netmond for $PROJECT/$EXPERIMENT $PELAB_IP $SIP";
echo "Starting up monitor for $PROJECT/$EXPERIMENT $PELAB_IP $SIP";
exec $NETMON_DIR/$NETMOND -v 2 | $PYTHON $MONITOR_DIR/$MONITOR $IPMAP $PROJECT/$EXPERIMENT $PELAB_IP $SIP
......@@ -6,9 +6,10 @@
# Start up our own stub
#
echo $SH ${STUB_DIR}/run-stub.sh
STUBPID=`log_output_background "stub" "$SH ${STUB_DIR}/run-stub.sh"`
$SH ${STUB_DIR}/run-stub.sh &
STUBPID=$!
# Kill the stub if we get killed - TODO: harsher kill?
trap "$AS_ROOT kill $STUBPID" EXIT
trap "$AS_ROOT kill $STUBPID; $AS_ROOT killall stubd" EXIT
#
# Give it time to come up
......
......@@ -16,5 +16,6 @@ export HOST_ROLE="stub"
#
# Just run the stub!
#
echo "Running PID $$"
echo "Starting stubd on $PLAB_IFACE ($PLAB_IP) Extra arguments: $*"
exec $AS_ROOT $STUB_DIR/$STUBD $PLAB_IFACE $*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment