/[smecontribs]/rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch
ViewVC logotype

Diff of /rpms/smeserver-sysmon/contribs10/smeserver-sysmon-systemd-11072.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.5 by trevorb, Sat Aug 6 01:04:28 2022 UTC Revision 1.9 by trevorb, Mon Aug 15 10:54:52 2022 UTC
# Line 38  diff -urN smeserver-sysmon-6.5.old/creat Line 38  diff -urN smeserver-sysmon-6.5.old/creat
38  \ No newline at end of file  \ No newline at end of file
39  +));  +));
40  +  +
 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]  
 +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  
41  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  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
42  --- smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon        2022-08-03 15:59:11.836382422 +1000  --- smeserver-sysmon-6.5.old/root/etc/rc.d/init.d/sysmon        2022-08-03 15:59:11.836382422 +1000
43  +++ smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon    1970-01-01 10:00:00.000000000 +1000  +++ smeserver-sysmon-6.5/root/etc/rc.d/init.d/sysmon    1970-01-01 10:00:00.000000000 +1000
# Line 115  diff -urN smeserver-sysmon-6.5.old/root/ Line 89  diff -urN smeserver-sysmon-6.5.old/root/
89  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  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
90  --- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service 1970-01-01 10:00:00.000000000 +1000  --- smeserver-sysmon-6.5.old/root/usr/lib/systemd/system/sysmon.service 1970-01-01 10:00:00.000000000 +1000
91  +++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service     2022-08-05 12:02:45.000000000 +1000  +++ smeserver-sysmon-6.5/root/usr/lib/systemd/system/sysmon.service     2022-08-05 12:02:45.000000000 +1000
92  @@ -0,0 +1,12 @@  @@ -0,0 +1,16 @@
93  +  +
94  +[Unit]  +[Unit]
95  +Description=System Monitor  +Description=System Monitor
# Line 123  diff -urN smeserver-sysmon-6.5.old/root/ Line 97  diff -urN smeserver-sysmon-6.5.old/root/
97  +Wants=network-online.target  +Wants=network-online.target
98  +  +
99  +[Service]  +[Service]
100    +Type=forking
101    +ExecStartPre=-/sbin/e-smith/service-status sysmon
102    +ExecStartPre=-/sbin/e-smith/expand-template /usr/lib/systemd/system/sysmon.service.d/50koozali.conf
103  +ExecStart=  +ExecStart=
104  +ExecStart=/usr/bin/perl /usr/sbin/sysmon  +ExecStart=-/usr/sbin/sysmon
 +  
 +[Install]  
 +WantedBy= sme-server.target  
105  +  +
 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]  
 +ExecStart=  
 +ExecStart=/usr/bin/perl /usr/sbin/sysmon  
 +  
106  +[Install]  +[Install]
107  +WantedBy= sme-server.target  +WantedBy= sme-server.target
108  +  +
109    diff -urN smeserver-sysmon-6.5.old/root/usr/sbin/sysmon smeserver-sysmon-6.5/root/usr/sbin/sysmon
110    --- smeserver-sysmon-6.5.old/root/usr/sbin/sysmon       2022-08-15 20:46:06.186627886 +1000
111    +++ smeserver-sysmon-6.5/root/usr/sbin/sysmon   2022-08-15 20:46:32.897160735 +1000
112    @@ -74,7 +74,7 @@
113             {
114             `/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`;}
115             my @sardata;
116    -        if ( -x '/usr/bin/sadf' ) {  @sardata=`/usr/bin/sadf -- -qrbuS -n DEV /var/lib/rrd/sysmon.process  2> /dev/null`; }# sadf  
117    +        if ( -x '/usr/bin/sadf' ) {  @sardata=`/usr/bin/sadf -U -- -qrbuS -n DEV /var/lib/rrd/sysmon.process  2> /dev/null`; }# sadf  
118             else { @sardata = `/usr/bin/sar -hqruS -P ALL -n DEV -f /var/lib/rrd/sysmon.process 2> /dev/null`; }# old systat
119             unlink("/var/lib/rrd/sysmon.process");
120    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed