Commit b43e6424 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor fixes to previous revision so that update-testbed works.

parent 126154b5
...@@ -307,7 +307,8 @@ if ($stopbed) { ...@@ -307,7 +307,8 @@ if ($stopbed) {
} }
print "** Testbed is quiet; stopping testbed daemons ... \n"; print "** Testbed is quiet; stopping testbed daemons ... \n";
if (system("$STARTUP stop >/dev/null 2>&1") || if (system("$STARTUP stop >/dev/null 2>&1") ||
system("$MFRISBEED stop >/dev/null 2>&1")) { (-x $MFRISBEED &&
system("$MFRISBEED stop >/dev/null 2>&1"))) {
Fatal("Could not stop testbed daemons. Stopping."); Fatal("Could not stop testbed daemons. Stopping.");
} }
$stopped = 1; $stopped = 1;
......
...@@ -7,6 +7,8 @@ use emdb; ...@@ -7,6 +7,8 @@ use emdb;
use Image; use Image;
use NodeType; use NodeType;
my $MFRISBEED_STARTUP = "/usr/local/etc/rc.d/3.mfrisbeed.sh";
sub InstallUpdate($$) sub InstallUpdate($$)
{ {
my ($version, $phase) = @_; my ($version, $phase) = @_;
...@@ -27,6 +29,11 @@ sub InstallUpdate($$) ...@@ -27,6 +29,11 @@ sub InstallUpdate($$)
# If something should run in the pre-install phase. # If something should run in the pre-install phase.
# #
if ($phase eq "pre") { if ($phase eq "pre") {
Phase "startupfile", "Installing master frisbee startup file", sub {
DoneIfExists($MFRISBEED_STARTUP);
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/rc.d install");
};
if ($gotem) { if ($gotem) {
print("\n", print("\n",
"*** PLEASE NOTE:\n", "*** PLEASE NOTE:\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