Attachment 185151 Details for Bug 274761 – makes dhclient-script manage its own lines and leave others alone â€“ unified diff

[patch] makes dhclient-script manage its own lines and leave others alone â€“ unified diff

nicer_ntp.conf_munging.patch (text/plain), 1.19 KB, created by Björn Persson on 2007-09-03 09:15:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Persson

Created: 2007-09-03 09:15:29 UTC

Size: 1.19 KB

patch

obsolete

>--- /sbin/dhclient-script.original	2007-09-03 01:03:39.000000000 +0200
>+++ /sbin/dhclient-script	2007-09-03 01:18:45.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 274761: 184921 | 185151