Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-stable
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
emulab
emulab-stable
Commits
7f2114ad
Commit
7f2114ad
authored
Jun 15, 2010
by
Ryan Jackson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dhcp-related fixes for subbosses
parent
5b03dab6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
GNUmakefile.in
GNUmakefile.in
+1
-0
db/dhcpd_makeconf.in
db/dhcpd_makeconf.in
+3
-3
dhcpd/GNUmakefile.in
dhcpd/GNUmakefile.in
+6
-3
No files found.
GNUmakefile.in
View file @
7f2114ad
...
...
@@ -236,6 +236,7 @@ endif
@$(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
...
...
db/dhcpd_makeconf.in
View file @
7f2114ad
...
...
@@ -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
();
...
...
dhcpd/GNUmakefile.in
View file @
7f2114ad
...
...
@@ -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 $<"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment