rpms/dhcp/F-9 dhcp.spec,1.213,1.214 linux,1.15,1.16

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15255

Modified Files:
	dhcp.spec linux 
Log Message:
* Wed Oct 01 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-20
- Make sure /etc/resolv.conf has restorecon run on it (#451560)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- dhcp.spec	30 Sep 2008 23:39:50 -0000	1.213
+++ dhcp.spec	1 Oct 2008 20:49:02 -0000	1.214
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  19%{?dist}
+Release:  20%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -430,6 +430,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Wed Oct 01 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-20
+- Make sure /etc/resolv.conf has restorecon run on it (#451560)
+
 * Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-19
 - Fix ldap patch for dhcpd so it can find its config file (#452985)
 


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/linux,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux	6 Aug 2008 19:39:59 -0000	1.15
+++ linux	1 Oct 2008 20:49:02 -0000	1.16
@@ -71,6 +71,10 @@
 
         change_resolv_conf $rscf
         rm -f $rscf
+
+        if [ -x /sbin/restorecon ]; then
+            /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1
+        fi
     fi
 }