Commit 5b05965b authored by Jonathon Duerig's avatar Jonathon Duerig

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 4163afcb 990d2fb2
......@@ -26,6 +26,15 @@ SCRIPTS = $(addprefix $(SRCDIR)/, \
rc.tiptunnels rc.trace rc.motelog rc.fakejail \
rc.tpmsetup)
SUBBOSS_SCRIPTS = $(addprefix $(SRCDIR)/, \
rc.config rc.misc rc.route \
rc.tunnels rc.ifconfig rc.delays rc.hostnames \
rc.syncserver rc.linkagent rc.mkelab rc.localize \
rc.keys rc.trafgen rc.tarfiles rc.rpms rc.progagent \
rc.startcmd rc.simulator rc.firewall \
rc.tiptunnels rc.trace rc.motelog rc.fakejail \
rc.tpmsetup rc.mksubboss)
include $(OBJDIR)/Makeconf
all:
......@@ -46,5 +55,6 @@ script-install:
$(INSTALL_PROGRAM) $(SRCDIR)/librc.pm $(BINDIR)/librc.pm
$(INSTALL_PROGRAM) $(SCRIPTS) $(BINDIR)/rc
subboss-script-install: script-install
$(INSTALL_PROGRAM) $(SRCDIR)/rc.mksubboss $(BINDIR)/rc
subboss-script-install:
$(INSTALL_PROGRAM) $(SRCDIR)/librc.pm $(BINDIR)/librc.pm
$(INSTALL_PROGRAM) $(SUBBOSS_SCRIPTS) $(BINDIR)/rc
......@@ -1008,7 +1008,7 @@ sub dhcpdconf($)
# Generate the dhcp configuration
#
system("$BINDIR/subboss_dhcpd_makeconf -r") == 0
or die("Could not generate dhcpd.conf");
or warn("Could not generate dhcpd.conf");
resched:
#
......
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