1 |
bytegw |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ntp-1.16.0/root/etc/e-smith/templates/etc/ntp/step-tickers/00timeServer mezzanine_patched_e-smith-ntp-1.16.0/root/etc/e-smith/templates/etc/ntp/step-tickers/00timeServer |
2 |
|
|
--- e-smith-ntp-1.16.0/root/etc/e-smith/templates/etc/ntp/step-tickers/00timeServer 2005-07-19 14:00:51.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_e-smith-ntp-1.16.0/root/etc/e-smith/templates/etc/ntp/step-tickers/00timeServer 2008-02-08 10:56:16.000000000 -0700 |
4 |
|
|
@@ -1,8 +1,16 @@ |
5 |
|
|
{ |
6 |
|
|
my $NTPenabled = $ntpd{'status'} || 'disabled'; |
7 |
|
|
+ my $server = $ntpd{NTPServer} || ''; |
8 |
|
|
if ($NTPenabled eq 'enabled') |
9 |
|
|
{ |
10 |
|
|
- $OUT .= $ntpd{'NTPServer'}; |
11 |
|
|
+ if ($server =~ /pool.ntp.org/) |
12 |
|
|
+ { |
13 |
|
|
+ $OUT .= "0.$server"; |
14 |
|
|
+ } |
15 |
|
|
+ else |
16 |
|
|
+ { |
17 |
|
|
+ $OUT .= "$server"; |
18 |
|
|
+ } |
19 |
|
|
} |
20 |
|
|
else |
21 |
|
|
{ |
22 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ntp-1.16.0/root/var/service/ntpd/run mezzanine_patched_e-smith-ntp-1.16.0/root/var/service/ntpd/run |
23 |
|
|
--- e-smith-ntp-1.16.0/root/var/service/ntpd/run 2005-08-17 14:16:50.000000000 -0600 |
24 |
|
|
+++ mezzanine_patched_e-smith-ntp-1.16.0/root/var/service/ntpd/run 2008-02-08 10:57:05.000000000 -0700 |
25 |
|
|
@@ -28,6 +28,7 @@ |
26 |
|
|
|
27 |
|
|
# Run ntpdate so we're not way off on startup. |
28 |
|
|
ntpstep=/etc/ntp/step-tickers |
29 |
|
|
+/sbin/e-smith/expand-template $ntpstep |
30 |
|
|
tickers=`/bin/sed -e 's/\#.*$//g' $ntpstep` |
31 |
|
|
/usr/sbin/ntpdate -b -p 8 $tickers |
32 |
|
|
|