From 37d2807ff362d2308ee92e5fe176ddfe5e2f3b0c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:15:43 +0000
Subject: auto-import changelog data from dhcp-3.0.1rc12-4.src.rpm

3.0.1rc12-4
- Fix init to check config during restart
3.0.1rc12-3
- Fix init script to create leases file if missing

---

diff --git a/dhcp.spec b/dhcp.spec
index e33887b..fa535c6 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name: dhcp
 Epoch: 1
 Version: 3.0.1rc12
-Release: 2.1 
+Release: 4
 Copyright: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -190,6 +190,12 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Wed Mar 25 2004 Dan Walsh <dwalsh@redhat.com> 1:3.0.1rc12-4
+- Fix init to check config during restart 
+
+* Wed Mar 24 2004 Dan Walsh <dwalsh@redhat.com> 1:3.0.1rc12-3
+- Fix init script to create leases file if missing
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/dhcpd.init b/dhcpd.init
index 0035f85..2770a20 100644
--- a/dhcpd.init
+++ b/dhcpd.init
@@ -18,11 +18,26 @@
 
 [ -f /usr/sbin/dhcpd ] || exit 0
 [ -f /etc/dhcpd.conf ] || exit 0
-[ -f /var/lib/dhcp/dhcpd.leases ] || exit 0
+[ -f /var/lib/dhcp/dhcpd.leases ] || touch /var/lib/dhcp/dhcpd.leases 
 
 RETVAL=0
 prog="dhcpd"
 
+configtest()
+{
+	local retval TEMP=/tmp/dhcpd$$.err
+
+	/usr/sbin/dhcpd -t 2>$TEMP
+	retval=$?
+	if [ $retval -ne 0 ]
+	then
+		cat $TEMP
+		rm -f $TEMP
+	fi
+
+	return $retval
+}
+
 start() {
 	# Start daemons.
 	echo -n $"Starting $prog: "
@@ -52,6 +67,7 @@ case "$1" in
 	stop
 	;;
   restart|reload)
+	configtest || exit $?
 	stop
 	start
 	RETVAL=$?
@@ -64,7 +80,7 @@ case "$1" in
 	fi
 	;;
   configtest)
-	dhcpd -t
+	configtest
 	RETVAL=$?
 	;;
   status)