rpms/dhcp/devel dhcp.spec,1.168,1.169 linux,1.5,1.6

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596

Modified Files:
	dhcp.spec linux 
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- dhcp.spec	16 Aug 2007 18:33:06 -0000	1.168
+++ dhcp.spec	4 Sep 2007 15:54:47 -0000	1.169
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  3%{?dist}
+Release:  4%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -431,6 +431,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-4
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
 * Wed Aug 15 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-3
 - Remove the -x switch enabling extended new option info.  If given to
   dhclient now, it's ignored.


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux	11 Apr 2007 19:38:56 -0000	1.5
+++ linux	4 Sep 2007 15:54:47 -0000	1.6
@@ -410,15 +410,10 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
-	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
-	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
-	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
-	    for s in $new_ntp_servers ${localClocks[@]};
-	      do
-	      echo 'server '$s >> /etc/ntp.conf;
+	    /bin/egrep -v '^server .*  # added by /sbin/dhclient-script$'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    for s in $new_ntp_servers; do
+	      echo "server $s  # added by /sbin/dhclient-script" >> /etc/ntp.conf;
 	    done
-	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
 		: ;
 	    else