[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-27-gac9a6eb

[Andrew Pollock]

The following commit has been merged in the master branch:
commit ac9a6eb66125f51f5ff3e2ea22d933a824b5c854
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Aug 27 13:15:50 2011 -0700

    isc-dhcp-server.postinst: document new variables in /etc/default/isc-dhcp-server
    
    Patch from Peter Marschall

diff --git a/debian/changelog b/debian/changelog
index c1cb3e7..3eed356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ isc-dhcp (4.2.2-1) unstable; urgency=low
   * Apply patch from Peter Marschall to split the rfc3442-classless-routes hook
     into a Linux and a kFreeBSD variant, so that the Linux one can use iproute
     (closes: #630519)
+  * debian/isc-dhcp-server.postinst: apply patch from Peter Marshall to
+    document new variables in /etc/default/isc-dhcp-server
 
- -- Andrew Pollock <apollock at debian.org>  Wed, 24 Aug 2011 23:16:09 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:14:05 -0700
 
 isc-dhcp (4.1.1-P1-18) unstable; urgency=low
 
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 301a174..126009f 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -42,6 +42,16 @@ umask 022
 # This is a POSIX shell fragment
 #
 
+# Path to dhcpd's config file (default: /etc/dhcp/dhcpd.conf).
+#DHCPD_CONF=/etc/dhcp/dhcpd.conf
+
+# Path to dhcpd's PID file (default: /var/run/dhcpd.pid).
+#DHCPD_PID=/var/run/dhcpd.pid
+
+# Additional options to start dhcpd with.
+#	Don't use options -cf or -pf here; use DHCPD_CONF/ DHCPD_PID instead
+#OPTIONS=""
+
 # On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
 #	Separate multiple interfaces with spaces, e.g. "eth0 eth1".
 INTERFACES=""

-- 
ISC DHCP packaging for Debian