Commit 24a20def authored by Mike Hibler's avatar Mike Hibler

Another old change: make sure all shell vars are set correctly

parent 0edf334d
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 , 2009University of Utah and the Flux Group. # Copyright (c) 2000-2009 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -37,6 +37,16 @@ RCDIR = $(DESTDIR)/usr/local/etc/rc.d ...@@ -37,6 +37,16 @@ RCDIR = $(DESTDIR)/usr/local/etc/rc.d
ISMFS = $(ETCDIR)/ismfs ISMFS = $(ETCDIR)/ismfs
INSTALL = /usr/bin/install -c 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 \ install client-install: bincheck basefbsd-install etc-install \
sup-install script-install bin-install sup-install script-install bin-install
...@@ -92,3 +102,11 @@ sysetc-install: dir-install netif-emulab ...@@ -92,3 +102,11 @@ sysetc-install: dir-install netif-emulab
script-install: dir-install script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/rc.freebsd $(BINDIR)/rc $(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
...@@ -24,6 +24,18 @@ _cmdifn= ...@@ -24,6 +24,18 @@ _cmdifn=
ELAB_LOGDIR=@CLIENT_VARDIR@/logs ELAB_LOGDIR=@CLIENT_VARDIR@/logs
ELAB_BOOTDIR=@CLIENT_VARDIR@/boot 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 # this is a separate function so we can redirect all the output below
cnet_dhcp() cnet_dhcp()
{ {
......
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