e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
--- e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm	2010-10-12 19:29:24.000000000 +0200
+++ mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm	2010-10-12 19:27:59.000000000 +0200
@@ -1690,7 +1690,7 @@
     unless ((($start & $netmask) == $localnet) &&
 	    (($end & $netmask) == $localnet))
     {
-	my $dhcpLeases = "/var/lib/dhcp/dhcpd.leases";
+	my $dhcpLeases = "/var/lib/dhcpd/dhcpd.leases";
 	open (WR, ">$dhcpLeases")
 	    or die gettext("Can't open output file"),
 		" $dhcpLeases", ": $!\n";
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/var/service/dhcpd/run mezzanine_patched_e-smith-base-5.2.0/root/var/service/dhcpd/run
--- e-smith-base-5.2.0/root/var/service/dhcpd/run	2005-11-21 05:28:11.000000000 +0100
+++ mezzanine_patched_e-smith-base-5.2.0/root/var/service/dhcpd/run	2010-10-12 19:26:51.000000000 +0200
@@ -23,12 +23,18 @@
 interface=$(/sbin/e-smith/db configuration getprop InternalInterface Name)
 
 configfile=/etc/dhcpd.conf
-leasefile=/var/lib/dhcp/dhcpd.leases
+leasefile=/var/lib/dhcpd/dhcpd.leases
 
 /bin/touch $leasefile
 
 /sbin/e-smith/expand-template $configfile
 
+# Relocate the leases file to its new location
+if [ -e /var/lib/dhcp/dhcpd.leases -a ! -z /var/lib/dhcpd/dhcpd.leases ]; then
+    mv -f /var/lib/dhcp/dhcpd.leases \
+        /var/lib/dhcpd/dhcpd.leases
+fi
+
 exec /usr/sbin/dhcpd -d -f \
     -cf $configfile \
     -lf $leasefile \