Commit 7f2114ad authored by Ryan Jackson's avatar Ryan Jackson

dhcp-related fixes for subbosses

parent 5b03dab6
...@@ -236,6 +236,7 @@ endif ...@@ -236,6 +236,7 @@ endif
@$(MAKE) -C db subboss-install @$(MAKE) -C db subboss-install
@$(MAKE) -C tmcd subboss-install @$(MAKE) -C tmcd subboss-install
@$(MAKE) -C rc.d subboss-install @$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install
# Hack: this should probably be done by a subboss-install # Hack: this should probably be done by a subboss-install
# script, but there isn't a huge need for that yet # script, but there isn't a huge need for that yet
@rm -f $(INSTALL_RCDIR)/isc-dhcpd @rm -f $(INSTALL_RCDIR)/isc-dhcpd
......
...@@ -368,10 +368,10 @@ if ($install) { ...@@ -368,10 +368,10 @@ if ($install) {
if (kill('TERM', $dpid) == 0) { if (kill('TERM', $dpid) == 0) {
fatal("Could not kill(TERM) process $dpid (dhcpd): $!"); fatal("Could not kill(TERM) process $dpid (dhcpd): $!");
} }
}
for my $subboss (keys %subboss_dhcp_servers) { for my $subboss (keys %subboss_dhcp_servers) {
RestartSubbossDhcp($subboss, $restart); RestartSubbossDhcp($subboss, $restart);
}
} }
TBScriptUnlock(); TBScriptUnlock();
......
...@@ -11,7 +11,8 @@ SUBDIR = dhcpd ...@@ -11,7 +11,8 @@ SUBDIR = dhcpd
ETCDIR = /usr/local/etc 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 include $(OBJDIR)/Makeconf
...@@ -23,12 +24,14 @@ all: $(DHCPD_FILES) ...@@ -23,12 +24,14 @@ all: $(DHCPD_FILES)
include $(TESTBED_SRCDIR)/GNUmakerules 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 install: $(ETCDIR)/dhcpd.conf.template $(ETCDIR)/dhcpd.conf.subboss.template
-chmod 664 $(ETCDIR)/dhcpd.conf.template -chmod 664 $(ETCDIR)/dhcpd.conf.template
-chmod 664 $(ETCDIR)/dhcpd.conf.subboss.template
clean: clean:
rm -f $(DHCPD_FILES) rm -f $(DHCPD_FILES) $(SUBBOSS_DHCPD_FILES)
$(ETCDIR)/%: % $(ETCDIR)/%: %
@echo "Installing $<" @echo "Installing $<"
......
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