From 0cd6d609ebce32bc130d147adc5690c90467fd36 Mon Sep 17 00:00:00 2001 From: Mike Hibler <mike@flux.utah.edu> Date: Tue, 15 Mar 2005 18:29:29 +0000 Subject: [PATCH] Get rid of dhclient.conf file. We have a new hack for dealing with hardwiring vs. not on the control net. --- tmcd/freebsd/GNUmakefile.in | 4 +--- tmcd/freebsd/dhclient.conf | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 tmcd/freebsd/dhclient.conf diff --git a/tmcd/freebsd/GNUmakefile.in b/tmcd/freebsd/GNUmakefile.in index 6f8414584d..ff923b8053 100644 --- a/tmcd/freebsd/GNUmakefile.in +++ b/tmcd/freebsd/GNUmakefile.in @@ -1,6 +1,6 @@ # # EMULAB-COPYRIGHT -# Copyright (c) 2000-2004 University of Utah and the Flux Group. +# Copyright (c) 2000-2005 University of Utah and the Flux Group. # All rights reserved. # @@ -71,7 +71,6 @@ mfs-install: destdircheck common-install etc-install \ frisbee-mfs-install: destdircheck $(INSTALL) -m 644 $(SRCDIR)/mfs-frisbee-rc.conf $(SYSETCDIR)/rc.conf $(INSTALL) -m 644 $(SRCDIR)/mfs-frisbee-rc.local $(SYSETCDIR)/rc.local - $(INSTALL) -m 755 $(SRCDIR)/dhclient.conf $(SYSETCDIR)/dhclient.conf $(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \ $(SYSETCDIR)/dhclient-exit-hooks $(INSTALL) -m 755 $(SRCDIR)/dhclient-enter-hooks \ @@ -171,7 +170,6 @@ etc-install: dir-install sysetc-install sysetc-install: dir-install $(INSTALL) -m 755 $(SRCDIR)/rc.conf $(SYSETCDIR)/rc.conf - $(INSTALL) -m 755 $(SRCDIR)/dhclient.conf $(SYSETCDIR)/dhclient.conf $(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \ $(SYSETCDIR)/dhclient-exit-hooks $(INSTALL) -m 755 $(SRCDIR)/dhclient-enter-hooks \ diff --git a/tmcd/freebsd/dhclient.conf b/tmcd/freebsd/dhclient.conf deleted file mode 100644 index 8d7723f34f..0000000000 --- a/tmcd/freebsd/dhclient.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Force DHCP interfaces to known state, since the switch ports are all -# hardwired speed/duplex, which breaks autosense on this side. This is -# especially relevant to ElabInElab which use an experimental interface -# for an inner control network, and DHCP over that interface. -# -media "media 100baseTX mediaopt full-duplex"; -- GitLab