139 |
@@ -1,2 +0,0 @@ |
@@ -1,2 +0,0 @@ |
140 |
-[Service] |
-[Service] |
141 |
-MemoryLimit=250000 |
-MemoryLimit=250000 |
142 |
|
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 |
143 |
|
--- 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 |
144 |
|
+++ 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 |
145 |
|
@@ -1,14 +1,4 @@ |
146 |
|
-# nut UPS specific subservices |
147 |
|
-{ |
148 |
|
-my $status = $ntp{status} || 'disabled'; |
149 |
|
+# nut ntpd specific subservices |
150 |
|
+# this would conflict with ntpd |
151 |
|
+disable ntpdate.service |
152 |
|
|
153 |
|
-if ($status eq 'enabled') { |
154 |
|
- $OUT .= "disable ntpdate.service\n"; |
155 |
|
- $OUT .= "enable ntpd.service\n"; |
156 |
|
- } |
157 |
|
-else |
158 |
|
- { |
159 |
|
- $OUT .= "disable ntpdate.service\n"; |
160 |
|
- $OUT .= "disable ntpd.service\n"; |
161 |
|
- } |
162 |
|
-} |