--- rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch	2022/08/06 03:06:56	1.6
+++ rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch	2022/08/15 10:54:52	1.9
@@ -38,35 +38,6 @@ diff -urN smeserver-sysmon-6.5.old/creat
 \ No newline at end of file
 +));
 +
-diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit
---- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit	1970-01-01 10:00:00.000000000 +1000
-+++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/10Unit	2022-08-03 16:10:56.207980079 +1000
-@@ -0,0 +1,6 @@
-+
-+[Unit]
-+Description=System Monitor
-+After=network-online.target
-+Wants=network-online.target
-+
-diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service
---- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service	1970-01-01 10:00:00.000000000 +1000
-+++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/20Service	2022-08-03 16:12:26.238523740 +1000
-@@ -0,0 +1,5 @@
-+
-+[Service]
-+ExecStartPre=
-+ExecStartPre=-/sbin/e-smith/service-status sysmon
-+ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf
-+ExecStart=
-+ExecStart=-/usr/sbin/sysmon
-+
-diff -urN smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install
---- smeserver-sysmon-6.5.old/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install	1970-01-01 10:00:00.000000000 +1000
-+++ smeserver-sysmon-6.5/root/etc/e-smith/templates/usr/lib/systemd/system/sysmon.service.d/50koozali.conf/30Install	2022-08-03 16:11:05.607828018 +1000
-@@ -0,0 +1,3 @@
-+
-+[Install]
-+WantedBy=sme-server.target
 diff -urN smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon
 --- smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon	2022-08-03 15:59:11.836382422 +1000
 +++ smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon	1970-01-01 10:00:00.000000000 +1000
@@ -118,7 +89,7 @@ diff -urN smeserver-sysmon-6.5.old/root/
 diff -urN smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service
 --- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service	1970-01-01 10:00:00.000000000 +1000
 +++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service	2022-08-05 12:02:45.000000000 +1000
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,16 @@
 +
 +[Unit]
 +Description=System Monitor
@@ -126,7 +97,7 @@ diff -urN smeserver-sysmon-6.5.old/root/
 +Wants=network-online.target
 +
 +[Service]
-+ExecStartPre=
++Type=forking
 +ExecStartPre=-/sbin/e-smith/service-status sysmon
 +ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf
 +ExecStart=
@@ -135,23 +106,15 @@ diff -urN smeserver-sysmon-6.5.old/root/
 +[Install]
 +WantedBy= sme-server.target
 +
-diff -urN smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf
---- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf	1970-01-01 10:00:00.000000000 +1000
-+++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service.d/50koozali.conf	2022-08-05 12:02:45.000000000 +1000
-@@ -0,0 +1,12 @@
-+
-+[Unit]
-+Description=System Monitor
-+After=network-online.target
-+Wants=network-online.target
-+
-+[Service]
-+ExecStartPre=
-+ExecStartPre=-/sbin/e-smith/service-status sysmon
-+ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf
-+ExecStart=
-+ExecStart=-/usr/sbin/sysmon
-+ 
-+[Install]
-+WantedBy= sme-server.target
-+
+diff -urN smeserver-sysmon-6.5.old/root/usr/sbin/sysmon smeserver-sysmon-6.5/root/usr/sbin/sysmon
+--- smeserver-sysmon-6.5.old/root/usr/sbin/sysmon	2022-08-15 20:46:06.186627886 +1000
++++ smeserver-sysmon-6.5/root/usr/sbin/sysmon	2022-08-15 20:46:32.897160735 +1000
+@@ -74,7 +74,7 @@
+         {
+         `/usr/lib64/sa/sadc 1 1 /var/lib/rrd/sysmon.process > /dev/null 2>&1; /usr/lib64/sa/sadc 1 1 /var/lib/rrd/sysmon.stats > /dev/null 2>&1`;}
+         my @sardata;
+-        if ( -x '/usr/bin/sadf' ) {  @sardata=`/usr/bin/sadf -- -qrbuS -n DEV /var/lib/rrd/sysmon.process  2> /dev/null`; }# sadf  
++        if ( -x '/usr/bin/sadf' ) {  @sardata=`/usr/bin/sadf -U -- -qrbuS -n DEV /var/lib/rrd/sysmon.process  2> /dev/null`; }# sadf  
+         else { @sardata = `/usr/bin/sar -hqruS -P ALL -n DEV -f /var/lib/rrd/sysmon.process 2> /dev/null`; }# old systat
+         unlink("/var/lib/rrd/sysmon.process");
+