--- rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008-bz8881-improve-systemd-driftfile.patch 2020/11/27 05:12:40 1.8 +++ rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008-bz8881-improve-systemd-driftfile.patch 2020/11/27 14:44:32 1.9 @@ -139,3 +139,24 @@ diff -Nur e-smith-ntp-2.6.0.old/root/usr @@ -1,2 +0,0 @@ -[Service] -MemoryLimit=250000 +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 +--- 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 ++++ 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 +@@ -1,14 +1,4 @@ +-# nut UPS specific subservices +-{ +-my $status = $ntp{status} || 'disabled'; ++# nut ntpd specific subservices ++# this would conflict with ntpd ++disable ntpdate.service + +-if ($status eq 'enabled') { +- $OUT .= "disable ntpdate.service\n"; +- $OUT .= "enable ntpd.service\n"; +- } +-else +- { +- $OUT .= "disable ntpdate.service\n"; +- $OUT .= "disable ntpd.service\n"; +- } +-}