rpms/dhcp/F-7 dhcp.spec,1.164,1.165 linux,1.5,1.6
David Cantrell (dcantrel)
fedora-extras-commits at redhat.com
Tue Sep 4 15:54:10 UTC 2007
Author: dcantrel
Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25480
Modified Files:
dhcp.spec linux
Log Message:
* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- dhcp.spec 9 Jul 2007 14:59:25 -0000 1.164
+++ dhcp.spec 4 Sep 2007 15:53:38 -0000 1.165
@@ -10,7 +10,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp
Version: 3.0.5
-Release: 38%{?dist}
+Release: 39%{?dist}
Epoch: 12
License: ISC
Group: System Environment/Daemons
@@ -434,6 +434,9 @@
%{_libdir}/libdhcp4client.a
%changelog
+* Tue Sep 04 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-39
+- Do not override manually configured NTP servers in /etc/ntp.conf (#274761)
+
* Mon Jul 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-38
- Remove -TERM option from killproc command (#245317)
Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/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:53:38 -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
More information about the fedora-extras-commits
mailing list