Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
24a20def
Commit
24a20def
authored
Oct 26, 2009
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Another old change: make sure all shell vars are set correctly
parent
0edf334d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletion
+31
-1
tmcd/freebsd7/GNUmakefile.in
tmcd/freebsd7/GNUmakefile.in
+19
-1
tmcd/freebsd7/netif-emulab.in
tmcd/freebsd7/netif-emulab.in
+12
-0
No files found.
tmcd/freebsd7/GNUmakefile.in
View file @
24a20def
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-200
7 , 200
9University of Utah and the Flux Group.
# Copyright (c) 2000-2009
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -37,6 +37,16 @@ RCDIR = $(DESTDIR)/usr/local/etc/rc.d
ISMFS = $(ETCDIR)/ismfs
INSTALL = /usr/bin/install -c
destdircheck:
@if [ -z "$(DESTDIR)" ]; then \
echo "You must define DESTDIR for this target!"; \
false; \
fi
@if [ "$(DESTDIR)" = "/" ]; then \
echo "DESTDIR is '/', really really bad idea!"; \
false; \
fi
install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install
...
...
@@ -92,3 +102,11 @@ sysetc-install: dir-install netif-emulab
script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/rc.freebsd $(BINDIR)/rc
frisbee-mfs-install: destdircheck
(cd ../freebsd; $(MAKE) frisbee-mfs-install)
rm -f $(SYSETCDIR)/rc.early
$(INSTALL) -m 644 $(SRCDIR)/frisbee/rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 644 $(SRCDIR)/frisbee/rc.local $(SYSETCDIR)/rc.local
$(INSTALL) -m 444 $(SRCDIR)/rc.dhclient $(SYSETCDIR)/rc.conf.d/dhclient
tmcd/freebsd7/netif-emulab.in
View file @
24a20def
...
...
@@ -24,6 +24,18 @@ _cmdifn=
ELAB_LOGDIR=@CLIENT_VARDIR@/logs
ELAB_BOOTDIR=@CLIENT_VARDIR@/boot
# XXX accomodation for BSD-based frisbee MFS
if [ ! -d "$ELAB_BOOTDIR" ]; then
if [ -r /etc/emulab/paths.sh ]; then
. /etc/emulab/paths.sh
ELAB_LOGDIR=$LOGDIR
ELAB_BOOTDIR=$BOOTDIR
else
ELAB_LOGDIR=/etc/testbed
ELAB_BOOTDIR=/etc/testbed
fi
fi
# this is a separate function so we can redirect all the output below
cnet_dhcp()
{
...
...
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