Commit ccf723dc authored by Leigh B Stoller's avatar Leigh B Stoller

Merge remote branch 'central'

parents caae3ca1 532c0015
......@@ -219,13 +219,13 @@ endif
@$(MAKE) -C tmcd client-install
subboss: client
@$(MAKE) -C os subboss
@$(MAKE) -C utils subboss
subboss-install: subboss
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event client-install
endif
@$(MAKE) -C os client-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
......@@ -233,9 +233,11 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
endif
@$(MAKE) -C sensors client-install
@$(MAKE) -C utils subboss-install
@$(MAKE) -C os subboss-install
@$(MAKE) -C db subboss-install
@$(MAKE) -C tmcd subboss-install
@$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install
# Hack: this should probably be done by a subboss-install
# script, but there isn't a huge need for that yet
@rm -f $(INSTALL_RCDIR)/isc-dhcpd
......
......@@ -368,10 +368,10 @@ if ($install) {
if (kill('TERM', $dpid) == 0) {
fatal("Could not kill(TERM) process $dpid (dhcpd): $!");
}
}
for my $subboss (keys %subboss_dhcp_servers) {
RestartSubbossDhcp($subboss, $restart);
for my $subboss (keys %subboss_dhcp_servers) {
RestartSubbossDhcp($subboss, $restart);
}
}
TBScriptUnlock();
......
......@@ -11,7 +11,8 @@ SUBDIR = dhcpd
ETCDIR = /usr/local/etc
DHCPD_FILES = dhcpd.conf.template dhcpd.conf.subboss.template
DHCPD_FILES = dhcpd.conf.template
SUBBOSS_DHCPD_FILES = dhcpd.conf.subboss.template
include $(OBJDIR)/Makeconf
......@@ -23,12 +24,14 @@ all: $(DHCPD_FILES)
include $(TESTBED_SRCDIR)/GNUmakerules
subboss-install: $(ETCDIR)/dhcpd.conf.subboss.template
-chmod 664 $(ETCDIR)/dhcpd.conf.subboss.template
install: $(ETCDIR)/dhcpd.conf.template $(ETCDIR)/dhcpd.conf.subboss.template
-chmod 664 $(ETCDIR)/dhcpd.conf.template
-chmod 664 $(ETCDIR)/dhcpd.conf.subboss.template
clean:
rm -f $(DHCPD_FILES)
rm -f $(DHCPD_FILES) $(SUBBOSS_DHCPD_FILES)
$(ETCDIR)/%: %
@echo "Installing $<"
......
......@@ -60,6 +60,16 @@ endif
$(MAKE) -C dijkstra client-install
$(MAKE) -C genhostsfile client-install
subboss: client
$(MAKE) -C frisbee.redux all
subboss-install: subboss client-install
ifeq ($(SYSTEM),FreeBSD)
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux install
else
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux install
endif
mfs:
$(MAKE) -C imagezip client
$(MAKE) -C zapdisk mfs
......
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