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 | |
| parent | 3327f7d99d7012f2356c7f645a8b8f5d34df9b8b (diff) | |
| download | contrib-4d3ba7955f1c21d28ca73ba95e0286ba49ffe59b.tar.gz contrib-4d3ba7955f1c21d28ca73ba95e0286ba49ffe59b.tar.xz | |
dhcp: Fixes #161
Diffstat (limited to 'dhcp')
| -rw-r--r-- | dhcp/.footprint | 1 | ||||
| -rw-r--r-- | dhcp/.md5sum | 2 | ||||
| -rw-r--r-- | dhcp/Pkgfile | 2 | ||||
| -rw-r--r-- | dhcp/default-config.diff | 19 |
4 files changed, 15 insertions, 9 deletions
diff --git a/dhcp/.footprint b/dhcp/.footprint index dc9cf1d6a..48c2b7632 100644 --- a/dhcp/.footprint +++ b/dhcp/.footprint @@ -51,3 +51,4 @@ drwxr-xr-x root/root usr/sbin/ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/state/ drwxr-xr-x root/root var/state/dhcp/ +-rw-r--r-- root/root var/state/dhcp/dhcpd.leases (EMPTY) diff --git a/dhcp/.md5sum b/dhcp/.md5sum index 7a9030b04..ba35a6db3 100644 --- a/dhcp/.md5sum +++ b/dhcp/.md5sum @@ -1,3 +1,3 @@ -dc8a93310ae57c97d766df83632bf994 default-config.diff +9d3f34b05e622bdb3466ca725af454d1 default-config.diff ce5d30d4645e4eab1f54561b487d1ec7 dhcp-3.0.5.tar.gz 82393e9302e5d8da24ece3ec8717cd7e dhcpd diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile index 5cb4a9ca3..a6f1310cf 100644 --- a/dhcp/Pkgfile +++ b/dhcp/Pkgfile @@ -18,6 +18,8 @@ build() { make && make DESTDIR=$PKG INCDIR=/usr/include LIBDIR=/usr/lib install install -m644 client/dhclient.conf server/dhcpd.conf -t $PKG/etc install -D ../dhcpd $PKG/etc/rc.d/dhcpd + mkdir -p $PKG/var/state/dhcp + touch $PKG/var/state/dhcp/dhcpd.leases find $PKG/usr/man -type f -exec chmod 644 {} \; chown -R root:root $PKG } 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; } } |