rpms/dhcp/FC-5 dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1982

Added Files:
	dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch 
Log Message:
fix bug 191461

dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch:
 linux |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dhcp-3.0.3-dhclient-script-ntp-fudge-bz191461.patch ---
--- dhcp-3.0.4/client/scripts/linux.dhclient-script-ntp-fudge-bz191461	2006-06-07 19:27:04.000000000 -0400
+++ dhcp-3.0.4/client/scripts/linux	2006-06-08 14:09:04.000000000 -0400
@@ -410,13 +410,15 @@
 	    :
 	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
 	    save_previous /etc/ntp.conf
-	    /bin/egrep -v '(^[\ \	]*server)|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /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;
 	    done
+	    echo "$localClockFudge" >> /etc/ntp.conf;
 	    if [ -e /etc/ntp/step-tickers ]; then
 		save_previous /etc/ntp/step-tickers
 		echo '' > /etc/ntp/step-tickers