Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
7a953c2b
Commit
7a953c2b
authored
Jul 25, 2017
by
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/tbswap.in
View file @
7a953c2b
...
...
@@ -58,7 +58,6 @@ my $ELABINELAB = @ELABINELAB@;
my
$THISHOMEBASE
=
"
@THISHOMEBASE
@
";
my
$TESTMODE
=
@TESTMODE@
;
my
$DISABLE_EVENTS
=
"
@DISABLE_EVENT_SCHED
@
";
my
$piper
=
"
$TBROOT
/sbin/locpiper
";
my
$mapper
=
"
$TBROOT
/bin/mapper
";
my
$wrapper
=
"
$TBROOT
/libexec/assign_wrapper
";
my
$SNMPIT
=
"
$TBROOT
/bin/snmpit
";
...
...
@@ -523,19 +522,6 @@ sub doSwapout($) {
"
Failed to stop the event system.
");
$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($) {
# event system previously, so starting it again will fail!
#
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
||
(
$type
!=
MODIFY
&&
$type
!=
MODIFY_RECOVER
)))
{
print
"
Starting the event system.
\n
";
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment