Commit 7a953c2b authored by Mike Hibler's avatar Mike Hibler
Browse files

Rip out some 0-ed out robot code.

A nit that I didn't want getting mixed up with a later meaningful commit.
parent 7eb07802
...@@ -58,7 +58,6 @@ my $ELABINELAB = @ELABINELAB@; ...@@ -58,7 +58,6 @@ my $ELABINELAB = @ELABINELAB@;
my $THISHOMEBASE = "@THISHOMEBASE@"; my $THISHOMEBASE = "@THISHOMEBASE@";
my $TESTMODE = @TESTMODE@; my $TESTMODE = @TESTMODE@;
my $DISABLE_EVENTS = "@DISABLE_EVENT_SCHED@"; my $DISABLE_EVENTS = "@DISABLE_EVENT_SCHED@";
my $piper = "$TBROOT/sbin/locpiper";
my $mapper = "$TBROOT/bin/mapper"; my $mapper = "$TBROOT/bin/mapper";
my $wrapper = "$TBROOT/libexec/assign_wrapper"; my $wrapper = "$TBROOT/libexec/assign_wrapper";
my $SNMPIT = "$TBROOT/bin/snmpit"; my $SNMPIT = "$TBROOT/bin/snmpit";
...@@ -523,19 +522,6 @@ sub doSwapout($) { ...@@ -523,19 +522,6 @@ sub doSwapout($) {
"Failed to stop the event system."); "Failed to stop the event system.");
$swapout_errors = 1; $swapout_errors = 1;
} }
#
# Stop the location piper.
#
if (0 && -x $piper) {
print "Stopping the location piper\n";
if (system("$piper -k $pid $eid")) {
tberror({type => 'secondary', severity => SEV_SECONDARY,
error => ['piper_stop_failed']},
"Failed to stop location piper.");
$swapout_errors = 1;
}
}
} }
} }
...@@ -1683,18 +1669,6 @@ sub doSwapin($) { ...@@ -1683,18 +1669,6 @@ sub doSwapin($) {
# event system previously, so starting it again will fail! # event system previously, so starting it again will fail!
# #
if (! ($DISABLE_EVENTS || $elabinelab)) { if (! ($DISABLE_EVENTS || $elabinelab)) {
#
# For the robot testbed, start the location piper *before* the event
# system.
#
if (0 && -x $piper && ($type != MODIFY && $type != MODIFY_RECOVER)) {
print "Starting the location piper.\n";
if (system("$piper $pid $eid")) {
tberror "Failed to start the location piper.";
return 1;
}
}
if (($update_Eventsys_restart || if (($update_Eventsys_restart ||
($type != MODIFY && $type != MODIFY_RECOVER))) { ($type != MODIFY && $type != MODIFY_RECOVER))) {
print "Starting the event system.\n"; print "Starting the event system.\n";
......
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