Hi,
I've created a patch (for 4.2.4-1) which adds (a slightly modified
version of
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=22;filename=isc-dhcp-server;att=1;bug=592539)
the ability to start listening on IPv6 for isc-dhcp-server, as well the
debconf parameters needed to configure the running of zero/one/two
instances (for IPv4 and/or IPv6).
Cheers
Geza
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/dhclient6.conf isc-dhcp-4.2.2.dfsg.1/debian/dhclient6.conf
--- isc-dhcp-4.2.2.dfsg.1/debian/dhclient6.conf 1970-01-01 01:00:00.000000000 +0100
+++ isc-dhcp-4.2.2.dfsg.1/debian/dhclient6.conf 2012-06-25 10:28:12.972577091 +0200
@@ -0,0 +1,49 @@
+# Client configuration file example for DHCPv6
+
+# The client side command to enable rapid-commit (2 packet exchange)
+##send dhcp6.rapid-commit;
+
+# name-servers and domain-search are requested by default.
+# here is the way to request sip-servers-addresses too
+#also request dhcp6.sip-servers-addresses;
+
+# Likely to be useful: the script path
+#script "/etc/dhcp3//dhclient-script";
+
+#send host-name "andare.fugue.com";
+send host-name = gethostname();
+#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
+#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, domain-search, host-name,
+# netbios-name-servers, netbios-scope, interface-mtu,
+# rfc3442-classless-static-routes, ntp-servers;
+#require subnet-mask, domain-name-servers;
+#timeout 60;
+#retry 60;
+#reboot 10;
+#select-timeout 5;
+#initial-interval 2;
+#script "/etc/dhcp3/dhclient-script";
+#media "-link0 -link1 -link2", "link0 link1";
+#reject 01:00:a0::10;
+
+#alias {
+# interface "eth0";
+# fixed-address6 01:00:a0::10;
+# fixed-prefix6 01:00:a0::/64;
+#}
+
+#lease {
+# interface "eth0";
+# fixed-address 01:00:a0::10;
+# medium "link0 link1";
+# option host-name "andare.swiftmedia.com";
+# fixed-prefix6 01:00:a0::/64;
+# option dhcp6-name-servers ::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;
+#}
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/dhcpd6.conf isc-dhcp-4.2.2.dfsg.1/debian/dhcpd6.conf
--- isc-dhcp-4.2.2.dfsg.1/debian/dhcpd6.conf 1970-01-01 01:00:00.000000000 +0100
+++ isc-dhcp-4.2.2.dfsg.1/debian/dhcpd6.conf 2012-06-25 10:34:29.816576503 +0200
@@ -0,0 +1,106 @@
+#
+# Sample configuration file for ISC dhcpdv6 for Debian
+#
+#
+
+# IPv6 address valid lifetime
+# (at the end the address is no longer usable by the client)
+# (set to 30 days, the usual IPv6 default)
+default-lease-time 2592000;
+
+# IPv6 address preferred lifetime
+# (at the end the address is deprecated, i.e., the client should use
+# other addresses for new connections)
+# (set to 7 days, the usual IPv6 default)
+preferred-lifetime 604800;
+
+# T1, the delay before Renew
+# (default is 1/2 preferred lifetime)
+# (set to 1 hour)
+option dhcp-renewal-time 3600;
+
+# T2, the delay before Rebind (if Renews failed)
+# (default is 3/4 preferred lifetime)
+# (set to 2 hours)
+option dhcp-rebinding-time 7200;
+
+# Enable RFC 5007 support (same than for DHCPv4)
+allow leasequery;
+
+# Global definitions for name server address(es) and domain search list
+#option dhcp6.name-servers 3ffe:501:ffff:100:200:ff:fe00:3f3e;
+#option dhcp6.domain-search "test.example.com","example.com";
+
+# Set preference to 255 (maximum) in order to avoid waiting for
+# additional servers when there is only one
+##option dhcp6.preference 255;
+
+# Server side command to enable rapid-commit (2 packet exchange)
+##option dhcp6.rapid-commit;
+
+# The delay before information-request refresh
+# (minimum is 10 minutes, maximum one day, default is to not refresh)
+# (set to 6 hours)
+option dhcp6.info-refresh-time 21600;
+
+# The path of the lease file
+#dhcpv6-lease-file-name "/var/lib/dhcp/dhcpd6.leases";
+
+# Static definition (must be global)
+#host myclient {
+# # The entry is looked up by this
+# host-identifier option
+# dhcp6.client-id 00:01:00:01:00:04:93:e0:00:00:00:00:a2:a2;
+
+# # A fixed address
+# fixed-address6 3ffe:501:ffff:100::1234;
+
+# # A fixed prefix
+# fixed-prefix6 3ffe:501:ffff:101::/64;
+
+# # Override of the global definitions,
+# # works only when a resource (address or prefix) is assigned
+# option dhcp6.name-servers 3ffe:501:ffff:100:200:ff:fe00:4f4e;
+
+# # For debug (to see when the entry statements are executed)
+# # (log "sol" when a matching Solicitation is received)
+# ##if packet(0,1) = 1 { log(debug,"sol"); }
+#}
+
+#host otherclient {
+# # This host entry is hopefully matched if the client supplies a DUID-LL
+# # or DUID-LLT containing this MAC address.
+# hardware ethernet 01:00:80:a2:55:67;
+#
+# fixed-address6 3ffe:501:ffff:100::4321;
+#}
+
+# The subnet where the server is attached
+# (i.e., the server has an address in this subnet)
+#subnet6 3ffe:501:ffff:100::/64 {
+# # Two addresses available to clients
+# # (the third client should get NoAddrsAvail)
+# range6 3ffe:501:ffff:100::10 3ffe:501:ffff:100::11;
+#
+# # Use the whole /64 prefix for temporary addresses
+# # (i.e., direct application of RFC 4941)
+# range6 3ffe:501:ffff:100:: temporary;
+#
+# # Some /64 prefixes available for Prefix Delegation (RFC 3633)
+# prefix6 3ffe:501:ffff:100:: 3ffe:501:ffff:111:: /64;
+#}
+
+# A second subnet behind a relay agent
+#subnet6 3ffe:501:ffff:101::/64 {
+# range6 3ffe:501:ffff:101::10 3ffe:501:ffff:101::11;
+#
+# # Override of the global definitions,
+# # works only when a resource (address or prefix) is assigned
+# option dhcp6.name-servers 3ffe:501:ffff:101:200:ff:fe00:3f3e;
+#
+#}
+
+# A third subnet behind a relay agent chain
+#subnet6 3ffe:501:ffff:102::/64 {
+# range6 3ffe:501:ffff:102::10 3ffe:501:ffff:102::11;
+#}
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.install isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.install
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.install 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.install 2012-06-25 10:35:39.400576400 +0200
@@ -1,5 +1,6 @@
usr/sbin/dhclient sbin
etc/dhcp/dhclient.conf
+etc/dhcp/dhclient6.conf
usr/share/man/man8/dhclient.8
usr/share/man/man8/dhclient-script.8
usr/share/man/man5/dhclient.conf.5
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.conffile isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.conffile
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.conffile 1970-01-01 01:00:00.000000000 +0100
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.conffile 2012-06-24 17:37:37.640672522 +0200
@@ -0,0 +1 @@
+isc-dhcp-server.default /etc/default/isc-dhcp-server
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.config isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.config
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.config 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.config 2012-06-24 17:49:46.876671910 +0200
@@ -11,14 +11,27 @@
# Read current configuration - the user might not use dpkg-reconfigure
# to change /etc/default/isc-dhcp-server, so we need to do this to
# preserve the configuration.
+
if [ -r ${INITCONFFILE} ]; then
. ${INITCONFFILE}
- db_set isc-dhcp-server/interfaces "${INTERFACES}"
+ db_set isc-dhcp-server/v4_enabled "${V4_ENABLED}"
+ db_set isc-dhcp-server/v6_enabled "${V6_ENABLED}"
+ db_set isc-dhcp-server/interfaces_v4 "${INTERFACES_V4}"
+ db_set isc-dhcp-server/interfaces_v6 "${INTERFACES_V6}"
fi
db_title "DHCP Server"
-db_input low isc-dhcp-server/interfaces || true
+db_input low isc-dhcp-server/v4_enabled || true
+db_go
+
+db_input low isc-dhcp-server/v6_enabled || true
+db_go
+
+db_input low isc-dhcp-server/interfaces_v4 || true
+db_go
+
+db_input low isc-dhcp-server/interfaces_v6 || true
db_go
db_input high isc-dhcp-server/new_auth_behavior || true
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.default isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.default
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.default 1970-01-01 01:00:00.000000000 +0100
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.default 2012-06-24 18:12:47.520670037 +0200
@@ -0,0 +1,33 @@
+# Defaults for dhcp initscript
+# sourced by /etc/init.d/dhcp
+# installed at /etc/default/isc-dhcp-server by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# you can enable v4 and/or v6 protocols
+V4_ENABLED="yes"
+V6_ENABLED="no"
+
+# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
+# Separate multiple interfaces with spaces, e.g. "eth0 eth1".
+INTERFACES_V4="none"
+INTERFACES_V6="none"
+
+# Path to dhcpd's config file (default: /etc/dhcp/dhcpd.conf).
+#DHCPD_CONF=/etc/dhcp/dhcpd.conf
+
+# Path to dhcpdv6's config file (default: /etc/dhcp/dhcpd6.conf).
+#DHCPD6_CONF=/etc/dhcp/dhcpd6.conf
+
+# Path to dhcpd's PID file (default: /var/run/dhcpd.pid).
+#DHCPD_PID=/var/run/dhcpd.pid
+
+# Path to dhcpdv6's PID file (default: /var/run/dhcpd6.pid).
+#DHCPD6_PID=/var/run/dhcpd6.pid
+
+# Additional options to start dhcpd with.
+# Don't use options -cf or -pf here;
+# use DHCPD_CONF/ DHCPD_PID, DHCPD6_CONF/ DHCPD6_PID instead
+#OPTIONS=""
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.init.d isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.init.d
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.init.d 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.init.d 2012-06-24 21:38:44.716650205 +0200
@@ -35,7 +35,7 @@
[ -f "$DHCPD_DEFAULT" ] && . "$DHCPD_DEFAULT"
NAME=dhcpd
-DESC="ISC DHCP server"
+DESC="ISC DHCPv4 server"
# fallback to default config file
DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
# try to read pid file name from config file, with fallback to /var/run/dhcpd.pid
@@ -44,57 +44,104 @@
fi
DHCPD_PID="${DHCPD_PID:-/var/run/dhcpd.pid}"
+NAME6=dhcpd6
+DESC6="ISC DHCPv6 server"
+# fallback to default config file
+DHCPD6_CONF=${DHCPD6_CONF:-/etc/dhcp/dhcpd6.conf}
+# try to read pid file name from config file, with fallback to /var/run/dhcpd6.pid
+if [ -z "$DHCPD6_PID" ]; then
+ DHCPD6_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"(.*)"[ \t]*;.*$/\1/p' < "$DHCPD6_CONF" 2>/dev/null | head -n 1)
+fi
+DHCPD6_PID="${DHCPD6_PID:-/var/run/dhcpd6.pid}"
+
+# $1 version -4 or -6
+# $2 config file
test_config()
{
- if ! /usr/sbin/dhcpd -t $OPTIONS -q -cf "$DHCPD_CONF" > /dev/null 2>&1; then
- echo "dhcpd self-test failed. Please fix $DHCPD_CONF."
+ if ! /usr/sbin/dhcpd $1 -t $OPTIONS -q -cf "$2" > /dev/null 2>&1; then
+ echo "dhcpd self-test failed. Please fix $2."
echo "The error was: "
- /usr/sbin/dhcpd -t $OPTIONS -cf "$DHCPD_CONF"
+ /usr/sbin/dhcpd $1 -t $OPTIONS -cf "$2"
exit 1
fi
}
-# single arg is -v for messages, -q for none
+# $1 is -v for messages, -q for none
+# $2 PID file path
+# $3 NAME
check_status()
{
- if [ ! -r "$DHCPD_PID" ]; then
- test "$1" != -v || echo "$NAME is not running."
+ if [ ! -r "$2" ]; then
+ test "$1" != -v || echo "$3 is not running."
return 3
fi
- if read pid < "$DHCPD_PID" && ps -p "$pid" > /dev/null 2>&1; then
- test "$1" != -v || echo "$NAME is running."
+ if read pid < "$2" && ps -p "$pid" > /dev/null 2>&1; then
+ test "$1" != -v || echo "$3 is running."
return 0
else
- test "$1" != -v || echo "$NAME is not running but $DHCPD_PID exists."
+ test "$1" != -v || echo "$3 is not running but $2 exists."
return 1
fi
}
+start_daemon()
+{
+ VERSION=$1
+ CONF_FILE=$2
+ PROCESS=$3
+ PIDFILE=$4
+ INTERFACES=$5
+ DESCRIPTION=$6
+
+ test_config "$VERSION" "$CONF_FILE"
+ log_daemon_msg "Starting $DESCRIPTION" "$PROCESS"
+ start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
+ --exec /usr/sbin/dhcpd -- \
+ $VERSION -q $OPTIONS -cf "$CONFFILE" -pf "$PIDFILE" "$INTERFACES"
+ sleep 2
+
+ if check_status -q $PIDFILE $NAME; then
+ log_end_msg 0
+ else
+ log_failure_msg "check syslog for diagnostics."
+ log_end_msg 1
+ exit 1
+ fi
+}
+
+stop_daemon()
+{
+ PROCESS=$1
+ PIDFILE=$2
+ DESCRIPTION=$3
+
+ log_daemon_msg "Stopping $DESCRIPTION" "$PROCESS"
+ start-stop-daemon --stop --quiet --pidfile "$PIDFILE"
+ sleep 2
+ rm -f "$PIDFILE"
+}
+
case "$1" in
start)
- test_config
- log_daemon_msg "Starting $DESC" "$NAME"
- start-stop-daemon --start --quiet --pidfile "$DHCPD_PID" \
- --exec /usr/sbin/dhcpd -- \
- -q $OPTIONS -cf "$DHCPD_CONF" -pf "$DHCPD_PID" $INTERFACES
- sleep 2
-
- if check_status -q; then
- log_end_msg 0
- else
- log_failure_msg "check syslog for diagnostics."
- log_end_msg 1
- exit 1
+ if [ "$V4_ENABLED" == "yes" -o "$V4_ENABLED" == "true" ]; then
+ start_daemon "-4" "$DHCPD_CONF" \
+ "$NAME" "$DHCPD_PID" "$INTERFACES_V4" "$DESC"
fi
+
+ if [ "$V6_ENABLED" == "yes" -o "$V6_ENABLED" == "true" ]; then
+ start_daemon "-6" "$DHCPD6_CONF" \
+ "$NAME6" "$DHCPD6_PID" "$INTERFACES_V6" "$DESC6"
+ fi
;;
stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID"
- log_end_msg $?
- rm -f "$DHCPD_PID"
+ if [ -f "$DHCPD_PID" ]; then
+ stop_daemon "$NAME" "$DHCPD_PID" "$DESC"
+ fi
+ if [ -f "$DHCPD6_PID" ]; then
+ stop_daemon "$NAME6" "$DHCPD6_PID" "$DESC6"
+ fi
;;
restart | force-reload)
- test_config
$0 stop
sleep 2
$0 start
@@ -104,7 +151,9 @@
;;
status)
echo -n "Status of $DESC: "
- check_status -v
+ check_status -v "$DHCPD_PID" "$NAME"
+ echo -n "Status of $DESC6: "
+ check_status -v "$DHCPD6_PID" "NAME6"
exit "$?"
;;
*)
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.install isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.install
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.install 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.install 2012-06-24 18:13:21.904669656 +0200
@@ -3,3 +3,4 @@
usr/share/man/man8/dhcpd.8
usr/sbin/dhcpd
etc/dhcp/dhcpd.conf
+etc/dhcp/dhcpd6.conf
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.postinst isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.postinst
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.postinst 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.postinst 2012-06-24 18:59:36.120665419 +0200
@@ -30,42 +30,47 @@
# them to be readable only by root.
umask 022
-# Generate configuration file if it does not exist, using default values.
-[ -r "${INITCONFFILE}" ] || {
- echo Generating ${INITCONFFILE}... >&2
- cat >${INITCONFFILE} <<'EOFMAGICNUMBER1234'
-# Defaults for isc-dhcp-server initscript
-# sourced by /etc/init.d/isc-dhcp-server
-# installed at /etc/default/isc-dhcp-server by the maintainer scripts
-
-#
-# 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=""
-EOFMAGICNUMBER1234
-}
-
# ------------------------- Debconf questions start ---------------------
-db_get isc-dhcp-server/interfaces || true
-INTERFACES="${RET}"
+db_get isc-dhcp-server/v4_enabled || true
+V4_ENABLED="${RET}"
+
+if [ -n "$V4_ENABLED" ]; then
+ TMPFILE="$(mktemp -q ${INITCONFFILE}.new.XXXXXX)"
+ sed -e "s,^[[:space:]]*V4_ENABLED[[:space:]]*=.*,V4_ENABLED=\"${V4_ENABLED}\"," \
+ <${INITCONFFILE} >${TMPFILE}
+ cp ${TMPFILE} ${INITCONFFILE}
+ rm ${TMPFILE}
+fi
+
+db_get isc-dhcp-server/v6_enabled || true
+V6_ENABLED="${RET}"
+
+if [ -n "$V6_ENABLED" ]; then
+ TMPFILE="$(mktemp -q ${INITCONFFILE}.new.XXXXXX)"
+ sed -e "s,^[[:space:]]*V6_ENABLED[[:space:]]*=.*,V6_ENABLED=\"${V6_ENABLED}\"," \
+ <${INITCONFFILE} >${TMPFILE}
+ cp ${TMPFILE} ${INITCONFFILE}
+ rm ${TMPFILE}
+fi
+
+db_get isc-dhcp-server/interfaces_v4 || true
+INTERFACES_V4="${RET}"
+
+if [ -n "$INTERFACES_V4" ]; then
+ TMPFILE="$(mktemp -q ${INITCONFFILE}.new.XXXXXX)"
+ sed -e "s,^[[:space:]]*INTERFACES_V4[[:space:]]*=.*,INTERFACES_V4=\"${INTERFACES_V4}\"," \
+ <${INITCONFFILE} >${TMPFILE}
+ cp ${TMPFILE} ${INITCONFFILE}
+ rm ${TMPFILE}
+fi
+
+db_get isc-dhcp-server/interfaces_v6 || true
+INTERFACES_V6="${RET}"
-if [ -n "$INTERFACES" ]; then
+if [ -n "$INTERFACES_V6" ]; then
TMPFILE="$(mktemp -q ${INITCONFFILE}.new.XXXXXX)"
- sed -e "s,^[[:space:]]*INTERFACES[[:space:]]*=.*,INTERFACES=\"${INTERFACES}\"," \
+ sed -e "s,^[[:space:]]*INTERFACES_V6[[:space:]]*=.*,INTERFACES_V6=\"${INTERFACES_V6}\"," \
<${INITCONFFILE} >${TMPFILE}
cp ${TMPFILE} ${INITCONFFILE}
rm ${TMPFILE}
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.templates isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.templates
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.templates 2012-04-27 19:33:49.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-server.templates 2012-06-24 18:01:27.392670784 +0200
@@ -11,17 +11,38 @@
Type: note
_Description: Manual configuration required after installation
After the DHCP server is installed, you will need to manually configure it
- by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf
- supplied is just a sample, and must be adapted to the network environment.
+ by editing the file /etc/dhcp/dhcpd.conf and/or /etc/dhcp/dhcpd6.conf.
+ Please note that the dhcpd.conf and dhcpd6.conf supplied are just samples,
+ and must be adapted to the network environment.
.
Please configure the DHCP server as soon as the installation finishes.
-Template: isc-dhcp-server/interfaces
+Template: isc-dhcp-server/v4_enabled
+Type: boolean
+_Description: Should DHCP server listen on IPv4?:
+ Please enable or disable serving requests for IPv4 addresses.
+
+Template: isc-dhcp-server/v6_enabled
+Type: boolean
+_Description: Should DHCP server listen on IPv6?:
+ Please enable or disable serving requests for IPv6 addresses.
+
+Template: isc-dhcp-server/interfaces_v4
+Type: string
+_Description: Network interfaces on which the DHCPv4 server should listen:
+ Please specify on which network interface(s) the (IPv4) DHCP server
+ should listen for DHCP requests. Multiple interface names should be
+ entered as a space-separated list.
+ .
+ The interfaces will be automatically detected if this field is left
+ blank.
+
+Template: isc-dhcp-server/interfaces_v6
Type: string
-_Description: Network interfaces on which the DHCP server should listen:
- Please specify on which network interface(s) the DHCP server should
- listen for DHCP requests. Multiple interface names should be entered
- as a space-separated list.
+_Description: Network interfaces on which the DHCPv6 server should listen:
+ Please specify on which network interface(s) the (IPv6) DHCP server
+ should listen for DHCP requests. Multiple interface names should be
+ entered as a space-separated list.
.
The interfaces will be automatically detected if this field is left
blank.
diff -urN isc-dhcp-4.2.2.dfsg.1/debian/rules isc-dhcp-4.2.2.dfsg.1/debian/rules
--- isc-dhcp-4.2.2.dfsg.1/debian/rules 2012-04-27 20:49:55.000000000 +0200
+++ isc-dhcp-4.2.2.dfsg.1/debian/rules 2012-06-24 21:44:10.308649125 +0200
@@ -105,9 +105,11 @@
# Install dhcp's conffile.
$(INSTALL_FILE) -m 644 debian/dhcpd.conf $(DESTDIR)/etc/dhcp
+ $(INSTALL_FILE) -m 644 debian/dhcpd6.conf $(DESTDIR)/etc/dhcp
# Install dhcp-client's conffiles.
$(INSTALL_FILE) -m 644 debian/dhclient.conf $(DESTDIR)/etc/dhcp
+ $(INSTALL_FILE) -m 644 debian/dhclient6.conf $(DESTDIR)/etc/dhcp
# udeb needs simplified dhclient script
$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.$(DEB_HOST_ARCH_OS).udeb \