Commit 4af5d1b8 authored by Mike Hibler's avatar Mike Hibler
Browse files

A couple of random pubsub fixups.

parent 5993f23a
...@@ -603,12 +603,17 @@ Phase "rc.d", "Setting up rc.d scripts", sub { ...@@ -603,12 +603,17 @@ Phase "rc.d", "Setting up rc.d scripts", sub {
} }
}; };
Phase "rc.testbed", "Installing testbed RC scripts", sub { Phase "rc.testbed", "Installing testbed RC scripts", sub {
Phase "elvind.sh", "Removing port version of elvind.sh", sub {
DoneIfDoesntExist("$RCDIR/elvind.sh");
ExecQuietFatal("/bin/rm -f $RCDIR/elvind.sh");
};
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/rc.d install"); ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/rc.d install");
}; };
Phase "unelvin", "Removing Elvin related startup scripts", sub {
Phase "elvind.sh", "Removing elvind startup", sub {
ExecQuietFatal("/bin/rm -f $RCDIR/elvind.sh $RCDIR/2.elvind.sh");
};
Phase "elvin_gateway.sh", "Removing elvin gateway startup", sub {
DoneIfDoesntExist("$RCDIR/3.elvin_gateway.sh");
ExecQuietFatal("/bin/rm -f $RCDIR/3.elvin_gateway.sh");
};
};
}; };
Phase "syslog", "Setting up syslog", sub { Phase "syslog", "Setting up syslog", sub {
......
...@@ -949,11 +949,10 @@ Phase "rc.d", "Setting up rc.d scripts", sub { ...@@ -949,11 +949,10 @@ Phase "rc.d", "Setting up rc.d scripts", sub {
}; };
if ($ELVIN_COMPAT) { if ($ELVIN_COMPAT) {
Phase "elvin-gateway", "Installing elvin gateway startup file", sub { Phase "elvin-gateway", "Installing elvin gateway startup file", sub {
PhaseSkip("elvind not installed, elvin_gateway not enabled")
if (! -x "/usr/local/libexec/elvind");
DoneIfExists("$RCDIR/3.elvin_gateway.sh"); DoneIfExists("$RCDIR/3.elvin_gateway.sh");
PhaseFail("Pubsub system or elvin_gateway is not installed") PhaseFail("Pubsub system or elvin_gateway is not installed")
if (! -e "$RCDIR/3.elvin_gateway");
ExecQuietFatal("mv $RCDIR/3.elvin_gateway ".
" $RCDIR/3.elvin_gateway.sh");
}; };
} }
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group. # Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
# For installation. # For installation.
...@@ -16,7 +16,7 @@ SYSTEM := $(shell uname -s) ...@@ -16,7 +16,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh 2.elvind.sh \ RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh \
2.dhcpd.sh 1.mysql-client.sh 2.dhcpd.sh 1.mysql-client.sh
OPS_SCRIPTS = 2.elvind.sh 3.and.sh 1.mysql-client.sh 1.mysql-server.sh OPS_SCRIPTS = 2.elvind.sh 3.and.sh 1.mysql-client.sh 1.mysql-server.sh
......
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