Commit ee199d04 authored by Mike Hibler's avatar Mike Hibler
Browse files

More whacking on 'flashboot' target to get it in synch with the changes

we have been making manually.
parent b60f004c
......@@ -43,6 +43,13 @@ client-install: destdircheck client
$(INSTALL) -m 644 $(SRCDIR)/loader.rc $(DESTDIR)/boot/loader.rc
$(INSTALL) -m 440 $(SRCDIR)/sudoers $(DESTDIR)/usr/local/etc/sudoers
rm -f $(SYSETCDIR)/rc.conf.d/dhclient
rm -f $(DESTDIR)/usr/local/etc/emulab/dhclient
rm -f $(DESTDIR)/etc/emulab/frisbee $(DESTDIR)/etc/emulab/growdisk
rm -rf $(DESTDIR)/etc/emulab/supfile $(DESTDIR)/root/.cvsup
cp /dev/null $(DESTDIR)/etc/emulab/nosup
rm -rf $(DESTDIR)/etc/jail
date '+FLASHBOOT-%y%m%d' > $(DESTDIR)/etc/emulab/emuboot-volid
@echo "NOTE: you will need to install $(DESTDIR)/etc/emulab/mbr*.dd"
clean:
$(MAKE) -C ../cdrom/groklilo clean
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -78,6 +78,10 @@ frisbee-mfs-install: frisbee-mfs
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux client-install
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C growdisk client-install
cdboot-install: mfs-install frisbee-mfs
$(MAKE) -e -C frisbee.redux client-install
$(MAKE) -e -C growdisk client-install
remote-install:
$(INSTALL) -m 755 -o root -g wheel -d $(LBINDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
......
......@@ -116,9 +116,7 @@ cdboot-install: destdircheck common-install etc-install \
echo >$(ISMFS) "This file indicates its the MFS. DO NOT DELETE!"
(cd ../../sensors/slothd; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../pxe; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../os/imagezip; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../os/frisbee.redux; $(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../os; $(MAKE) DESTDIR=$(DESTDIR) cdboot-install)
(cd ../../cdrom;$(MAKE) DESTDIR=$(DESTDIR) client-install)
(cd ../../tools/teachswitch; $(MAKE) DESTDIR=$(DESTDIR) client-install)
$(INSTALL) -m 755 $(SRCDIR)/../../install/newclient $(BINDIR)/newclient
......
......@@ -108,8 +108,17 @@ mfs-install:
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
#
# CD/Flash install DOES have the FreeBSD 6 stuff
#
cdboot-install:
(cd ../freebsd5; $(MAKE) all cdboot-install)
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(SYSETCDIR)/rc.conf.d/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(ETCDIR)/master.passwd
$(INSTALL) -m 444 $(SRCDIR)/rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \
$(SYSETCDIR)/dhclient-exit-hooks
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
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