| 1 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/ntp.conf/30driftfile e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/ntp.conf/30driftfile |
| 2 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/ntp.conf/30driftfile 2005-06-23 19:19:22.000000000 -0400 |
| 3 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/ntp.conf/30driftfile 2020-11-26 22:54:12.666000000 -0500 |
| 4 |
@@ -1,3 +1,3 @@ |
| 5 |
{ |
| 6 |
- $OUT = "driftfile /etc/ntp/drift"; |
| 7 |
+ $OUT = "driftfile /var/lib/ntp/drift"; |
| 8 |
} |
| 9 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service |
| 10 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service 1969-12-31 19:00:00.000000000 -0500 |
| 11 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service 2020-11-26 22:56:27.760000000 -0500 |
| 12 |
@@ -0,0 +1,20 @@ |
| 13 |
+[Service] |
| 14 |
+{ |
| 15 |
+ # memory limit to catch any memory leak before it kills the system |
| 16 |
+ use constant MIN_MEMORY_LIMIT => 35000000; |
| 17 |
+ |
| 18 |
+ # If there is a memory limit in the database and it is below the minimum, delete it. |
| 19 |
+ if (defined $ntpd{MemLimit} && $ntpd{MemLimit} < MIN_MEMORY_LIMIT) |
| 20 |
+ { |
| 21 |
+ $DB->get_prop_and_delete('ntpd','MemLimit'); |
| 22 |
+ delete $ntpd{MemLimit}; |
| 23 |
+ } |
| 24 |
+ |
| 25 |
+ $OUT .= "MemoryLimit="; |
| 26 |
+ $OUT .= $ntpd{MemLimit} || MIN_MEMORY_LIMIT; |
| 27 |
+ $OUT .= "\n"; |
| 28 |
+ |
| 29 |
+} |
| 30 |
+ExecStartPre=-/sbin/e-smith/expand-template /etc/ntp.conf |
| 31 |
+ExecStartPre=-/sbin/e-smith/systemd/initializedate |
| 32 |
+ |
| 33 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit |
| 34 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit 2020-11-26 21:25:12.992000000 -0500 |
| 35 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit 1969-12-31 19:00:00.000000000 -0500 |
| 36 |
@@ -1,18 +0,0 @@ |
| 37 |
-{ |
| 38 |
- # memory limit to catch any memory leak before it kills the system |
| 39 |
- use constant MIN_MEMORY_LIMIT => 35000000; |
| 40 |
- |
| 41 |
- # If there is a memory limit in the database and it is below the minimum, delete it. |
| 42 |
- if (defined $ntpd{MemLimit} && $ntpd{MemLimit} < MIN_MEMORY_LIMIT) |
| 43 |
- { |
| 44 |
- $DB->get_prop_and_delete('ntpd','MemLimit'); |
| 45 |
- delete $ntpd{MemLimit}; |
| 46 |
- } |
| 47 |
- |
| 48 |
- $OUT = "[Service]\n"; |
| 49 |
- $OUT .= "MemoryLimit="; |
| 50 |
- $OUT .= $ntpd{MemLimit} || MIN_MEMORY_LIMIT; |
| 51 |
- $OUT .= "\n"; |
| 52 |
- |
| 53 |
-} |
| 54 |
- |
| 55 |
diff -Nur e-smith-ntp-2.6.0.old/root/sbin/e-smith/systemd/initializedate e-smith-ntp-2.6.0/root/sbin/e-smith/systemd/initializedate |
| 56 |
--- e-smith-ntp-2.6.0.old/root/sbin/e-smith/systemd/initializedate 1969-12-31 19:00:00.000000000 -0500 |
| 57 |
+++ e-smith-ntp-2.6.0/root/sbin/e-smith/systemd/initializedate 2020-11-26 23:10:27.667000000 -0500 |
| 58 |
@@ -0,0 +1,21 @@ |
| 59 |
+#!/bin/bash |
| 60 |
+#first move old drift file if in the way |
| 61 |
+OLDFILE='/etc/ntp/drift' |
| 62 |
+NEWFILE='/var/lib/ntp/drift' |
| 63 |
+if [ -f "$NEWFILE" ]; then |
| 64 |
+ if [ -f "$OLDFILE" ];then |
| 65 |
+ /usr/bin/rm -f $OLDFILE |
| 66 |
+ fi |
| 67 |
+else |
| 68 |
+ if [ -f "$OLDFILE" ];then |
| 69 |
+ /usr/bin/mv $OLDFILE $NEWFILE |
| 70 |
+ fi |
| 71 |
+fi |
| 72 |
+if [ -f "$NEWFILE" ]; then |
| 73 |
+ /usr/bin/chown ntp:ntp $NEWFILE |
| 74 |
+fi |
| 75 |
+ |
| 76 |
+# Run ntpdate so we're not way off on startup. |
| 77 |
+ntpstep=/etc/ntp/step-tickers |
| 78 |
+tickers=`/bin/sed -e 's/\#.*$//g' $ntpstep` |
| 79 |
+/usr/sbin/ntpdate -b -p 8 $tickers |
| 80 |
diff -Nur e-smith-ntp-2.6.0.old/createlinks e-smith-ntp-2.6.0/createlinks |
| 81 |
--- e-smith-ntp-2.6.0.old/createlinks 2020-11-26 23:15:25.616000000 -0500 |
| 82 |
+++ e-smith-ntp-2.6.0/createlinks 2020-11-26 23:28:33.145000000 -0500 |
| 83 |
@@ -63,11 +63,12 @@ |
| 84 |
|
| 85 |
$event = "e-smith-ntp-update"; |
| 86 |
|
| 87 |
-foreach my $file (qw(/etc/ntp/step-tickers /etc/ntp.conf /usr/lib//systemd/system/ntpd.service.d/50koozali.conf)) |
| 88 |
+foreach my $file (qw(/etc/ntp/step-tickers /etc/ntp.conf /usr/lib//systemd/system/ntpd.service.d/50koozali.conf /etc/systemd/system-preset/49-koozali.preset)) |
| 89 |
{ |
| 90 |
templates2events( $file, $event ); |
| 91 |
} |
| 92 |
|
| 93 |
+event_link("systemd-default", $event, "10"); |
| 94 |
event_link("conf-timezone", $event, "30"); |
| 95 |
event_link("set-time-date", $event, "40"); |
| 96 |
event_link("systemd-reload", $event, "50"); |
| 97 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset |
| 98 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset 1969-12-31 19:00:00.000000000 -0500 |
| 99 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset 2020-11-26 23:22:46.951000000 -0500 |
| 100 |
@@ -0,0 +1,14 @@ |
| 101 |
+# nut UPS specific subservices |
| 102 |
+{ |
| 103 |
+my $status = $ntp{status} || 'disabled'; |
| 104 |
+ |
| 105 |
+if ($status eq 'enabled') { |
| 106 |
+ $OUT .= "disable ntpdate.service\n"; |
| 107 |
+ $OUT .= "enable ntpd.service\n"; |
| 108 |
+ } |
| 109 |
+else |
| 110 |
+ { |
| 111 |
+ $OUT .= "disable ntpdate.service\n"; |
| 112 |
+ $OUT .= "disable ntpd.service\n"; |
| 113 |
+ } |
| 114 |
+} |
| 115 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install |
| 116 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install 1969-12-31 19:00:00.000000000 -0500 |
| 117 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install 2020-11-26 23:26:16.570000000 -0500 |
| 118 |
@@ -0,0 +1,2 @@ |
| 119 |
+[Install] |
| 120 |
+WantedBy=sme-server.target |
| 121 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/systemd/system-preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/systemd/system-preset/80-koozali-ntp.preset |
| 122 |
--- e-smith-ntp-2.6.0.old/root/etc/systemd/system-preset/80-koozali-ntp.preset 2020-11-26 23:15:25.618000000 -0500 |
| 123 |
+++ e-smith-ntp-2.6.0/root/etc/systemd/system-preset/80-koozali-ntp.preset 1969-12-31 19:00:00.000000000 -0500 |
| 124 |
@@ -1,2 +0,0 @@ |
| 125 |
-enable ntpdate.service |
| 126 |
-enable ntpd.service |
| 127 |
diff -Nur e-smith-ntp-2.6.0.old/createlinks e-smith-ntp-2.6.0/createlinks |
| 128 |
--- e-smith-ntp-2.6.0.old/createlinks 2020-11-26 23:49:32.684000000 -0500 |
| 129 |
+++ e-smith-ntp-2.6.0/createlinks 2020-11-26 23:49:53.047000000 -0500 |
| 130 |
@@ -70,7 +70,6 @@ |
| 131 |
|
| 132 |
event_link("systemd-default", $event, "10"); |
| 133 |
event_link("conf-timezone", $event, "30"); |
| 134 |
-event_link("set-time-date", $event, "40"); |
| 135 |
event_link("systemd-reload", $event, "50"); |
| 136 |
|
| 137 |
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ntpd"); |
| 138 |
diff -Nur e-smith-ntp-2.6.0.old/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf e-smith-ntp-2.6.0/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf |
| 139 |
--- e-smith-ntp-2.6.0.old/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf 2020-11-26 23:56:30.134000000 -0500 |
| 140 |
+++ e-smith-ntp-2.6.0/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500 |
| 141 |
@@ -1,2 +0,0 @@ |
| 142 |
-[Service] |
| 143 |
-MemoryLimit=250000 |
| 144 |
diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset |
| 145 |
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset 2020-11-27 09:37:05.531000000 -0500 |
| 146 |
+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset 2020-11-27 09:38:47.124000000 -0500 |
| 147 |
@@ -1,14 +1,4 @@ |
| 148 |
-# nut UPS specific subservices |
| 149 |
-{ |
| 150 |
-my $status = $ntp{status} || 'disabled'; |
| 151 |
+# nut ntpd specific subservices |
| 152 |
+# this would conflict with ntpd |
| 153 |
+disable ntpdate.service |
| 154 |
|
| 155 |
-if ($status eq 'enabled') { |
| 156 |
- $OUT .= "disable ntpdate.service\n"; |
| 157 |
- $OUT .= "enable ntpd.service\n"; |
| 158 |
- } |
| 159 |
-else |
| 160 |
- { |
| 161 |
- $OUT .= "disable ntpdate.service\n"; |
| 162 |
- $OUT .= "disable ntpd.service\n"; |
| 163 |
- } |
| 164 |
-} |
Parent Directory
| 
Revision Log
| 
Revision Graph
