Commit 1eb3e0c0 authored by Mike Hibler's avatar Mike Hibler

Make explicit the dhclient files we symlink in /usr/local/bin for mfs installs.

parent bd9cc69b
......@@ -102,13 +102,15 @@ basefbsd-install: dir-install
(cd ../freebsd5; $(MAKE) all install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
basefbsd-subboss-install: dir-install
(cd ../freebsd5; $(MAKE) all subboss-install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
tweak-syslog:
@if [ -f $(SYSETCDIR)/newsyslog.conf ]; then \
......@@ -148,7 +150,8 @@ frisbee-mfs-install: destdircheck
(cd ../freebsd5; $(MAKE) all frisbee-mfs-install)
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
@if [ -r $(SRCDIR)/master.passwd ]; then \
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(SYSETCDIR); \
pwd_mkdb -d $(SYSETCDIR) $(SYSETCDIR)/master.passwd; \
......@@ -161,7 +164,8 @@ mfs-install:
(cd ../freebsd5; $(MAKE) all mfs-install)
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
@if [ -r $(SRCDIR)/master.passwd ]; then \
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(SYSETCDIR); \
pwd_mkdb -d $(SYSETCDIR) $(SYSETCDIR)/master.passwd; \
......
......@@ -102,13 +102,15 @@ basefbsd-install: dir-install
(cd ../freebsd5; $(MAKE) all install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
basefbsd-subboss-install: dir-install
(cd ../freebsd5; $(MAKE) all subboss-install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
# Do not even pretend to do cvsup anymore
sup-install: dir-install
......@@ -141,7 +143,8 @@ frisbee-mfs-install: destdircheck
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
rmdir $(DESTDIR)/usr/local/etc/emulab
$(INSTALL) -m 644 $(SRCDIR)/mfs-frisbee-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
......@@ -160,7 +163,8 @@ mfs-install: destdircheck
rm -rf $(DESTDIR)/root/.cvsup
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
$(INSTALL) -m 644 $(SRCDIR)/mfs-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
@if [ -r $(SRCDIR)/master.passwd ]; then \
......
......@@ -102,13 +102,15 @@ basefbsd-install: dir-install
(cd ../freebsd5; $(MAKE) all install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
basefbsd-subboss-install: dir-install
(cd ../freebsd5; $(MAKE) all subboss-install)
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
tweak-syslog:
@if [ -f $(SYSETCDIR)/newsyslog.conf ]; then \
......@@ -150,7 +152,8 @@ frisbee-mfs-install: destdircheck
rm -rf $(SYSETCDIR)/rc.conf.d
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
rmdir $(DESTDIR)/usr/local/etc/emulab
$(INSTALL) -m 644 $(SRCDIR)/mfs-frisbee-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
......@@ -169,7 +172,8 @@ mfs-install: destdircheck
rm -rf $(DESTDIR)/root/.cvsup
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
ln -s /etc/dhclient* $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-enter-hooks $(DESTDIR)/usr/local/etc/
ln -s /etc/dhclient-exit-hooks $(DESTDIR)/usr/local/etc/
$(INSTALL) -m 644 $(SRCDIR)/mfs-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 555 ./netif-emulab $(SYSETCDIR)/rc.d/netif-emulab
@if [ -r $(SRCDIR)/master.passwd ]; then \
......
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