--- rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008_systemd.patch	2020/11/16 16:34:00	1.1
+++ rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008_systemd.patch	2020/12/13 22:32:47	1.4
@@ -6,7 +6,7 @@ diff -urN e-smith-ntp-2.6.0.old/createli
  # Configuration template expansion of ntp.conf
  foreach my $file (
 -    qw(/etc/ntp/step-tickers /etc/ntp.conf /var/service/ntpd/env/MEMLIMIT))
-+    qw(/etc/ntp/step-tickers /etc/ntp.conf  /etc/systemd/system/ntpd.service.d/override.conf))
++    qw(/etc/ntp/step-tickers /etc/ntp.conf  /usr/lib//systemd/system/ntpd.service.d/50koozali.conf))
  {
      templates2events($file, qw(
  	    timeserver-update
@@ -25,7 +25,7 @@ diff -urN e-smith-ntp-2.6.0.old/createli
 -safe_symlink("../init.d/supervise/ntpd", "root/etc/rc.d/rc0.d/K26ntpd");
 +$event = "e-smith-ntp-update";
 +
-+foreach my $file (qw(/etc/ntp/step-tickers /etc/ntp.conf /etc/systemd/system/ntpd.service.d/50koozali.conf))
++foreach my $file (qw(/etc/ntp/step-tickers /etc/ntp.conf /usr/lib//systemd/system/ntpd.service.d/50koozali.conf))
 +{
 +    templates2events( $file, $event );
 +}
@@ -38,9 +38,9 @@ diff -urN e-smith-ntp-2.6.0.old/createli
 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/squid");
 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
-diff -urN e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit
---- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit	1970-01-01 04:00:00.000000000 +0400
-+++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit	2020-11-14 23:24:56.964745677 +0400
+diff -urN 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
+--- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib//systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit	1970-01-01 04:00:00.000000000 +0400
++++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib//systemd/system/ntpd.service.d/50koozali.conf/50MemoryLimit	2020-11-14 23:24:56.964745677 +0400
 @@ -0,0 +1,18 @@
 +{
 +   # memory limit to catch any memory leak before it kills the system
@@ -78,44 +78,9 @@ diff -urN e-smith-ntp-2.6.0.old/root/etc
 -   $OUT = $ntpd{MemLimit} || MIN_MEMORY_LIMIT;
 -}
 -
-diff -urN e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpdate.service e-smith-ntp-2.6.0/root/etc/systemd/system/ntpdate.service
---- e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpdate.service	1970-01-01 04:00:00.000000000 +0400
-+++ e-smith-ntp-2.6.0/root/etc/systemd/system/ntpdate.service	2020-11-14 11:06:30.000000001 +0400
-@@ -0,0 +1,14 @@
-+[Unit]
-+Description=Set time via NTP (ntpdate)
-+After=network-online.target nss-lookup.target
-+Before=time-sync.target
-+Wants=time-sync.target network-online.target
-+
-+[Service]
-+Type=oneshot
-+ExecStartPre=/sbin/e-smith/service-status ntpd
-+ExecStart=/usr/libexec/ntpdate-wrapper
-+RemainAfterExit=yes
-+
-+[Install]
-+WantedBy=sme-server.target
-diff -urN e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpd.service e-smith-ntp-2.6.0/root/etc/systemd/system/ntpd.service
---- e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpd.service	1970-01-01 04:00:00.000000000 +0400
-+++ e-smith-ntp-2.6.0/root/etc/systemd/system/ntpd.service	2020-11-14 11:07:10.000000001 +0400
-@@ -0,0 +1,13 @@
-+[Unit]
-+Description=Network Time Service (ntpd)
-+After=syslog.target ntpdate.service sntp.service
-+
-+[Service]
-+Type=forking
-+EnvironmentFile=-/etc/sysconfig/ntpd
-+ExecStartPre=/sbin/e-smith/service-status ntpd
-+ExecStart=/usr/sbin/ntpd -u ntp:ntp $OPTIONS
-+PrivateTmp=true
-+
-+[Install]
-+WantedBy=sme-server.target
-diff -urN e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpd.service.d/50koozali.conf e-smith-ntp-2.6.0/root/etc/systemd/system/ntpd.service.d/50koozali.conf
---- e-smith-ntp-2.6.0.old/root/etc/systemd/system/ntpd.service.d/50koozali.conf	1970-01-01 04:00:00.000000000 +0400
-+++ e-smith-ntp-2.6.0/root/etc/systemd/system/ntpd.service.d/50koozali.conf	2020-11-14 11:10:29.000000001 +0400
+diff -urN 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
+--- e-smith-ntp-2.6.0.old/root/usr/lib//systemd/system/ntpd.service.d/50koozali.conf	1970-01-01 04:00:00.000000000 +0400
++++ e-smith-ntp-2.6.0/root/usr/lib//systemd/system/ntpd.service.d/50koozali.conf	2020-11-14 11:10:29.000000001 +0400
 @@ -0,0 +1,2 @@
 +[Service]
 +MemoryLimit=250000