/[smeserver]/rpms/e-smith-nutUPS/sme10/e-smith-nutUPS-2.6.0-bz9423-bz11146.patch
ViewVC logotype

Diff of /rpms/e-smith-nutUPS/sme10/e-smith-nutUPS-2.6.0-bz9423-bz11146.patch

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

Revision 1.1 by jpp, Wed Nov 18 22:12:50 2020 UTC Revision 1.6 by jpp, Mon Dec 7 16:29:08 2020 UTC
# Line 24  diff -Nur e-smith-nutUPS-2.6.0.old/creat Line 24  diff -Nur e-smith-nutUPS-2.6.0.old/creat
24   }   }
25  +  +
26  +my $event="e-smith-nutUPS-update";  +my $event="e-smith-nutUPS-update";
27  +safe_symlink("try-reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/nut");  +safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut");
28  +templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);  +templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
29  +event_link("systemd-default", $event, "06");  +event_link("systemd-default", $event, "06");
30  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70nutUPS e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70nutUPS  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70nutUPS e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70nutUPS
# Line 36  diff -Nur e-smith-nutUPS-2.6.0.old/root/ Line 36  diff -Nur e-smith-nutUPS-2.6.0.old/root/
36  +$nutstatus = $nut{status} || 'disabled';  +$nutstatus = $nut{status} || 'disabled';
37  +$master = $nut{Master} || 'yes';  +$master = $nut{Master} || 'yes';
38  +  +
39  +if ($nutstatus eq ''enabled') {  +if ($nutstatus eq 'enabled') {
40  +       $OUT .= "enable         nut-server.service" if ($master eq  'yes');  +       $OUT .= "enable nut-server.service\n" if ($master eq  'yes');
41  +       $OUT .= "disabled       nut-server.service" unless ($master eq  'yes');  +       $OUT .= "disable nut-server.service\n" unless ($master eq  'yes');
42  +       $OUT .= "enable         nut-monitor.service";  +       $OUT .= "enable nut-monitor.service\n";
43  +  }  +  }
44  +else  +else
45  +  {  +  {
46  +        $OUT .= "enable nut-server.service";  +        $OUT .= "disable nut-server.service\n";
47  +        $OUT .= "enable nut-monitor.service";  +        $OUT .= "disable nut-monitor.service\n";
48  +  }  +  }
49  +}  +}
50  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/20unit e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/20unit  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit
51  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/20unit     1969-12-31 19:00:00.000000000 -0500  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit      1969-12-31 19:00:00.000000000 -0500
52  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/20unit 2020-11-18 16:59:54.550000000 -0500  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit  2020-11-18 16:59:54.550000000 -0500
53  @@ -0,0 +1,3 @@  @@ -0,0 +1,3 @@
54  +[Unit]  +[Unit]
55  +PartOf=nut.service  +PartOf=nut.service
56  +After=nut.service  +After=nut.service
57  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/40service e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/40service  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service
58  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/40service  1969-12-31 19:00:00.000000000 -0500  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service   1969-12-31 19:00:00.000000000 -0500
59  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/40service      2020-11-18 16:59:11.957000000 -0500  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service       2020-11-18 16:59:11.957000000 -0500
60  @@ -0,0 +1,2 @@  @@ -0,0 +1,2 @@
61  +[Service]  +[Service]
62  +ExecStartPre=/sbin/e-smith/service-status nut  +ExecStartPre=/sbin/e-smith/service-status nut
63  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/80install e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/80install  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/80install e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/80install
64  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/80install  1969-12-31 19:00:00.000000000 -0500  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/80install   1969-12-31 19:00:00.000000000 -0500
65  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/80install      2020-11-18 16:59:11.957000000 -0500  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/80install       2020-11-18 16:59:11.957000000 -0500
66  @@ -0,0 +1,2 @@  @@ -0,0 +1,2 @@
67  +[Install]  +[Install]
68  +WantedBy=sme-server.target  +WantedBy=sme-server.target
69  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit  diff -Nur e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/50koozali.conf/20unit e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/50koozali.conf/20unit
70  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit       1969-12-31 19:00:00.000000000 -0500  --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/50koozali.conf/20unit        1969-12-31 19:00:00.000000000 -0500
71  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit   2020-11-18 16:40:01.717000000 -0500  +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/50koozali.conf/20unit    2020-11-18 16:40:01.717000000 -0500
72  @@ -0,0 +1,4 @@  @@ -0,0 +1,4 @@
73  +[Unit]  +[Unit]
74  +PartOf=nut.service  +PartOf=nut.service
# Line 96  diff -Nur e-smith-nutUPS-2.6.0.old/root/ Line 96  diff -Nur e-smith-nutUPS-2.6.0.old/root/
96  +  +
97  +[Service]  +[Service]
98  +ExecStartPre=/sbin/e-smith/service-status nut  +ExecStartPre=/sbin/e-smith/service-status nut
99  +ExecStartPre=- /sbin/e-smith/expand-template /etc/sysconfig/ups  +ExecStartPre=-/sbin/e-smith/expand-template /etc/sysconfig/ups
100  +ExecStartPre=- /sbin/e-smith/expand-template /etc/ups/ups.conf  +ExecStartPre=-/sbin/e-smith/expand-template /etc/ups/ups.conf
101  +ExecStartPre=- /etc/ups/upsd.conf  +ExecStartPre=-/etc/ups/upsd.conf
102  +ExecStartPre=- /etc/ups/upsd.users  +ExecStartPre=-/etc/ups/upsd.users
103  +ExecStartPre=- /etc/ups/upsmon.conf  +ExecStartPre=-/etc/ups/upsmon.conf
104  +ExecStartPre=- /etc/ups/upssched.conf  +ExecStartPre=-/etc/ups/upssched.conf
105  +  +
106  +# The dummy program will exit  +# The dummy program will exit
107  +Type=oneshot  +Type=oneshot

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