diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2007-01-14 03:30:40 +1000 |
|---|---|---|
| committer | James Mills <prologic@shortcircuit.net.au> | 2007-01-14 03:30:40 +1000 |
| commit | 4d3ba7955f1c21d28ca73ba95e0286ba49ffe59b (patch) | |
| tree | 7e37b479ac394d75ee9b5a0db6155617efc45785 /dhcp/default-config.diff | |
| parent | 3327f7d99d7012f2356c7f645a8b8f5d34df9b8b (diff) | |
| download | contrib-4d3ba7955f1c21d28ca73ba95e0286ba49ffe59b.tar.gz contrib-4d3ba7955f1c21d28ca73ba95e0286ba49ffe59b.tar.xz | |
dhcp: Fixes #161
Diffstat (limited to 'dhcp/default-config.diff')
| -rw-r--r-- | dhcp/default-config.diff | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/dhcp/default-config.diff b/dhcp/default-config.diff index b6857dd24..a5f9f7468 100644 --- a/dhcp/default-config.diff +++ b/dhcp/default-config.diff @@ -1,6 +1,6 @@ -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 +diff -Nru dhcp-3.0.5-orig/client/dhclient.conf dhcp-3.0.5/client/dhclient.conf +--- dhcp-3.0.5-orig/client/dhclient.conf 1997-06-03 01:50:44.000000000 +0300 ++++ dhcp-3.0.5/client/dhclient.conf 2007-01-10 17:56:10.000000000 +0200 @@ -1,3 +1,7 @@ +# +# /etc/dhclient.conf: DHCP client configuration file, see dhclient.conf(5) @@ -24,10 +24,10 @@ diff -ur dhcp-3.0.4.orig/client/dhclient.conf dhcp-3.0.4/client/dhclient.conf } + +# 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 @@ +diff -Nru dhcp-3.0.5-orig/server/dhcpd.conf dhcp-3.0.5/server/dhcpd.conf +--- dhcp-3.0.5-orig/server/dhcpd.conf 2001-01-25 10:33:11.000000000 +0200 ++++ dhcp-3.0.5/server/dhcpd.conf 2007-01-10 17:56:20.000000000 +0200 +@@ -1,11 +1,11 @@ -# dhcpd.conf # -# Sample configuration file for ISC dhcpd @@ -38,8 +38,11 @@ diff -ur dhcp-3.0.4.orig/server/dhcpd.conf dhcp-3.0.4/server/dhcpd.conf +# Option definitions common to all supported networks. option domain-name "example.org"; option domain-name-servers ns1.example.org, ns2.example.org; ++ddns-update-style ad-hoc; -@@ -99,3 +98,5 @@ + default-lease-time 600; + max-lease-time 7200; +@@ -99,3 +99,5 @@ range 10.0.29.10 10.0.29.230; } } |