--- Makefile.conf.orig Tue Jun 26 20:31:36 2001 +++ Makefile.conf Mon Jul 2 11:37:29 2001 @@ -38,8 +38,8 @@ ETC = /etc VARRUN = /var/run VARDB = /var/db -LIBDIR=/usr/local/lib -INCDIR=/usr/local/include +LIBDIR=/usr/lib +INCDIR=/usr/include LIBS = COPTS = $(BINDDEF) $(CC_OPTIONS) DEBUG = -g @@ -288,17 +288,17 @@ #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \ # $(BINDDEF) $(CC_OPTIONS) #CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 +#ADMMANDIR = /usr/share/man/man8 #ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 +#FFMANDIR = /usr/share/man/man5 #FFMANEXT = .5 -#LIBMANDIR = /usr/man/man3 +#LIBMANDIR = /usr/share/man/man3 #LIBMANEXT = .3 -#USRMANDIR = /usr/man/man1 +#USRMANDIR = /usr/share/man/man1 #USRMANEXT = .1 #MANCAT = man #VARRUN = /var/run -#VARDB = /var/state/dhcp +#VARDB = /var/lib/dhcp #SCRIPT=linux ##--linux-2.0-- @@ -307,17 +307,17 @@ #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \ # $(BINDDEF) $(CC_OPTIONS) #CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 +#ADMMANDIR = /usr/share/man/man8 #ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 +#FFMANDIR = /usr/share/man/man5 #FFMANEXT = .5 -#LIBMANDIR = /usr/man/man3 +#LIBMANDIR = /usr/share/man/man3 #LIBMANEXT = .3 -#USRMANDIR = /usr/man/man1 +#USRMANDIR = /usr/share/man/man1 #USRMANEXT = .1 #MANCAT = man #VARRUN = /var/run -#VARDB = /var/state/dhcp +#VARDB = /var/lib/dhcp #SCRIPT=linux ##--linux-2.1-- @@ -326,20 +326,36 @@ #COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \ # $(BINDDEF) $(CC_OPTIONS) #CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 +#ADMMANDIR = /usr/share/man/man8 #ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 +#FFMANDIR = /usr/share/man/man5 #FFMANEXT = .5 -#LIBMANDIR = /usr/man/man3 +#LIBMANDIR = /usr/share/man/man3 #LIBMANEXT = .3 -#USRMANDIR = /usr/man/man1 +#USRMANDIR = /usr/share/man/man1 #USRMANEXT = .1 #MANCAT = man #VARRUN = /var/run -#VARDB = /var/state/dhcp +#VARDB = /var/lib/dhcp #SCRIPT=linux ##--linux-2.2-- +## Linux 2.4 +##--linux-2.4-- +#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF) +#CF = cf/linux.h +#ADMMANDIR = /usr/share/man/man8 +#ADMMANEXT = .8 +#FFMANDIR = /usr/share/man/man5 +#FFMANEXT = .5 +#LIBMANDIR = /usr/share/man/man3 +#LIBMANEXT = .3 +#MANCAT = man +#VARRUN = /var/run +#VARDB = /var/lib/dhcp +#SCRIPT=linux +##--linux-2.4-- + ## SCO UnixWare 7 ##--uw7-- #CF = cf/uw7.h --- client/dhclient.conf +++ client/dhclient.conf 2000/07/24 10:40:54 @@ -1,8 +1,28 @@ -send host-name "andare.fugue.com"; -send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; +# dhclient configuration file +# see "man dhclient.conf" for further details +# file: /etc/dhclient.conf +# + + +###################################################### +# Suggested configurations for Cable Modem providers # +# +# uncomment and fill in the appropriate section + +##################################################### +# @Home -- TCI, etc +# +# Uncomment the following line and enter your Client ID, which should +# have come in your mail from @Home +# +# send dhcp-client-identifier "c32423-a" + +#send host-name "andare.fugue.com"; +#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; +#supersede domain-name "fugue.com home.vix.com"; +#prepend domain-name-servers 127.0.0.1; + send dhcp-lease-time 3600; -supersede domain-name "fugue.com home.vix.com"; -prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; require subnet-mask, domain-name-servers; @@ -11,26 +31,7 @@ reboot 10; select-timeout 5; initial-interval 2; -script "/etc/dhclient-script"; -media "-link0 -link1 -link2", "link0 link1"; -reject 192.33.137.209; - -alias { - interface "ep0"; - fixed-address 192.5.5.213; - option subnet-mask 255.255.255.255; -} - -lease { - interface "ep0"; - fixed-address 192.33.137.200; - medium "link0 link1"; - option host-name "andare.swiftmedia.com"; - option subnet-mask 255.255.255.0; - option broadcast-address 192.33.137.255; - option routers 192.33.137.250; - option domain-name-servers 127.0.0.1; - renew 2 2000/1/12 00:00:01; - rebind 2 2000/1/12 00:00:01; - expire 2 2000/1/12 00:00:01; -} +script "/sbin/dhclient-script"; + +#media "-link0 -link1 -link2", "link0 link1"; +#reject 192.33.137.209; --- includes/cf/linux.h +++ includes/cf/linux.h Sun Mar 18 02:34:20 2001 @@ -84,7 +84,7 @@ #include /* gettimeofday()*/ -/* Databases go in /var/state/dhcp. It would also be valid to put them +/* Databases go in /var/lib/dhcp. It would also be valid to put them in /var/state/misc - indeed, given that there's only one lease file, it would probably be better. However, I have some ideas for optimizing the lease database that may result in a _lot_ of smaller files being @@ -92,11 +92,11 @@ directory. */ #ifndef _PATH_DHCPD_DB -#define _PATH_DHCPD_DB "/var/state/dhcp/dhcpd.leases" +#define _PATH_DHCPD_DB "/var/lib/dhcp/db/dhcpd.leases" #endif #ifndef _PATH_DHCLIENT_DB -#define _PATH_DHCLIENT_DB "/var/state/dhcp/dhclient.leases" +#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases" #endif /* Varargs stuff... */ --- includes/dhcpd.h +++ includes/dhcpd.h Sun Mar 18 02:38:16 2001 @@ -860,7 +860,7 @@ #endif #ifndef _PATH_DHCPD_DB -#define _PATH_DHCPD_DB "/etc/dhcpd.leases" +#define _PATH_DHCPD_DB "/var/lib/dhcp/db/dhcpd.leases" #endif #ifndef _PATH_DHCPD_PID @@ -877,7 +877,7 @@ #endif #ifndef _PATH_DHCLIENT_DB -#define _PATH_DHCLIENT_DB "/etc/dhclient.leases" +#define _PATH_DHCLIENT_DB "/var/run/dhclient.leases" #endif #ifndef _PATH_RESOLV_CONF