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

Annotation of /rpms/e-smith-nutUPS/sme10/e-smith-nutUPS-2.6.0-bz12287.patch

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

Revision 1.1 - (hide annotations) (download)
Mon Dec 26 03:29:15 2022 UTC (22 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-nutUPS-2_6_0-13_el7_sme, HEAD 
* Sun Dec 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-13.sme
- fix server failing if set as netserver [SME: 12287]
- remove log noise for tmp files
1 jpp 1.1 diff -Nur --no-dereference 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
2     --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit 2022-12-25 22:19:58.089000000 -0500
3     +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/20unit 2022-12-25 22:22:35.557000000 -0500
4     @@ -1,3 +1,3 @@
5     [Unit]
6     PartOf=nut.service
7     -After=nut.service
8     +After=nut.service network-online.target
9     diff -Nur --no-dereference 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
10     --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service 2022-12-25 22:19:58.103000000 -0500
11     +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf/40service 2022-12-25 22:25:09.489000000 -0500
12     @@ -1,3 +1,4 @@
13     [Service]
14     +ExecStartPre=
15     ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-run.conf
16     ExecStartPre=/sbin/e-smith/service-status nut
17     diff -Nur --no-dereference 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
18     --- e-smith-nutUPS-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit 2022-12-25 22:19:58.090000000 -0500
19     +++ e-smith-nutUPS-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/nut-server.service.d/50koozali.conf/20unit 2022-12-25 22:22:08.745000000 -0500
20     @@ -1,4 +1,4 @@
21     [Unit]
22     PartOf=nut.service
23     -After=nut.service
24     +After=nut.service network-online.target
25    
26     diff -Nur --no-dereference e-smith-nutUPS-2.6.0.old/root/usr/lib/systemd/system/nut-driver.service.d/51koozali.conf e-smith-nutUPS-2.6.0/root/usr/lib/systemd/system/nut-driver.service.d/51koozali.conf
27     --- e-smith-nutUPS-2.6.0.old/root/usr/lib/systemd/system/nut-driver.service.d/51koozali.conf 2022-12-25 22:19:58.103000000 -0500
28     +++ e-smith-nutUPS-2.6.0/root/usr/lib/systemd/system/nut-driver.service.d/51koozali.conf 2022-12-25 22:24:23.110000000 -0500
29     @@ -10,4 +10,5 @@
30     #------------------------------------------------------------
31    
32     [Service]
33     +ExecStartPre=
34     ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-run.conf
35     diff -Nur --no-dereference e-smith-nutUPS-2.6.0.old/root/usr/lib/systemd/system/nut.service e-smith-nutUPS-2.6.0/root/usr/lib/systemd/system/nut.service
36     --- e-smith-nutUPS-2.6.0.old/root/usr/lib/systemd/system/nut.service 2022-12-25 22:19:58.115000000 -0500
37     +++ e-smith-nutUPS-2.6.0/root/usr/lib/systemd/system/nut.service 2022-12-25 22:20:51.866000000 -0500
38     @@ -1,6 +1,6 @@
39     [Unit]
40     Description=Network UPS Tools - Parent service for Koozali SME Server
41     -After=local-fs.target network.target
42     +After=local-fs.target network.target network-online.target
43     Before=nut-server.service
44    
45     [Service]
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed