--- dhcpd.init	2007-04-02 13:35:53.000000000 +0100
+++ /etc/init.d/dhcpd6	2008-09-21 14:16:15.000000000 +0100
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $
 
-DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/${SVCNAME}.conf}
 
 depend() {
 	need net
@@ -33,11 +33,11 @@
 	fi
 
 	local leasefile="$(get_var lease-file-name)"
-	leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
-	if [ ! -f "${leasefile}" ] ; then
+	leasefile="${leasefile:-/var/lib/dhcp/${SVCNAME}.leases}"
+	if [ ! -f "${DHCPD_CHROOT}${leasefile}" ] ; then
 		ebegin "Creating ${leasefile}"
-		touch "${leasefile}"
-		chown dhcp:dhcp "${leasefile}"
+		touch "${DHCPD_CHROOT}${leasefile}"
+		chown dhcp:dhcp "${DHCPD_CHROOT}${leasefile}"
 		eend $? || return 1
 	fi
 
@@ -48,12 +48,12 @@
 	fi
 
 	local pidfile="$(get_var pid-file-name)"
-	pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
+	pidfile="${pidfile:-/var/run/dhcp/${SVCNAME}.pid}"
 
 	ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
 	start-stop-daemon --start --exec /usr/sbin/dhcpd \
 		--pidfile "${DHCPD_CHROOT}/${pidfile}" \
-		-- ${DHCPD_OPTS} -q -pf "${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
 		-user dhcp -group dhcp \
 		${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
 	eend $? \