diff --git a/dhcp.spec b/dhcp.spec index c8f8da4..75a99ca 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -13,7 +13,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 3.0.6 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 12 License: ISC Group: System Environment/Daemons @@ -432,6 +432,10 @@ fi %{_libdir}/libdhcp4client.a %changelog +* Wed Oct 24 2007 David Cantrell - 12:3.0.6-10 +- Fix 'restart' mode in init script (#349341) +- Make sure restorecon is run on /var/lib/dhcpd/dhcpd.leases (#251688) + * Tue Oct 23 2007 David Cantrell - 12:3.0.6-9 - Add missing /etc/openldap/dhcp.schema file (#330471) diff --git a/dhcpd.init b/dhcpd.init index 8d50d03..ce29a5c 100644 --- a/dhcpd.init +++ b/dhcpd.init @@ -53,7 +53,7 @@ conf="$(findConfig "$DHCPDARGS")" if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then mkdir -p /var/lib/dhcpd touch /var/lib/dhcpd/dhcpd.leases - [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1 + [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcpd/dhcpd.leases >/dev/null 2>&1 fi configtest() { @@ -117,7 +117,7 @@ case "$1" in RETVAL=$? ;; restart|force-reload) - stop && start + stop ; start RETVAL=$? ;; try-restart|reload) @@ -125,7 +125,7 @@ case "$1" in ;; condrestart) if [ -f $lockfile ]; then - stop && start + stop ; start RETVAL=$? fi ;;