contrib/dhcp/default-config.diff
2006-11-14 09:01:22 +10:00

48 lines
1.4 KiB
Diff

diff -ur dhcp-3.0.4.orig/client/dhclient.conf dhcp-3.0.4/client/dhclient.conf
--- dhcp-3.0.4.orig/client/dhclient.conf 1997-06-03 00:50:44.000000000 +0200
+++ dhcp-3.0.4/client/dhclient.conf 2006-05-17 01:41:16.000000000 +0200
@@ -1,3 +1,7 @@
+#
+# /etc/dhclient.conf: DHCP client configuration file, see dhclient.conf(5)
+#
+
send host-name "andare.fugue.com";
send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
send dhcp-lease-time 3600;
@@ -11,7 +15,7 @@
reboot 10;
select-timeout 5;
initial-interval 2;
-script "/etc/dhclient-script";
+script "/sbin/dhclient-script";
media "-link0 -link1 -link2", "link0 link1";
reject 192.33.137.209;
@@ -34,3 +38,5 @@
rebind 2 2000/1/12 00:00:01;
expire 2 2000/1/12 00:00:01;
}
+
+# End of file
diff -ur dhcp-3.0.4.orig/server/dhcpd.conf dhcp-3.0.4/server/dhcpd.conf
--- dhcp-3.0.4.orig/server/dhcpd.conf 2001-01-25 09:33:11.000000000 +0100
+++ dhcp-3.0.4/server/dhcpd.conf 2006-05-17 01:42:11.000000000 +0200
@@ -1,9 +1,8 @@
-# dhcpd.conf
#
-# Sample configuration file for ISC dhcpd
+# dhcpd.conf: Configuration file for ISC dhcpd
#
-# option definitions common to all supported networks...
+# Option definitions common to all supported networks.
option domain-name "example.org";
option domain-name-servers ns1.example.org, ns2.example.org;
@@ -99,3 +98,5 @@
range 10.0.29.10 10.0.29.230;
}
}
+
+# End of file