/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11091-wan.service.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11091-wan.service.patch

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


Revision 1.1 - (hide annotations) (download)
Wed Nov 11 20:47:30 2020 UTC (3 years, 11 months ago) by jpp
Branch: MAIN
* Tue Nov 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-49.sme
- move network service to systemd [SME: 11090]
- move wan service to systemd [SME: 11091]

1 jpp 1.1 diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
2     --- e-smith-base-5.8.0.old/createlinks 2020-11-11 14:07:33.351000000 -0500
3     +++ e-smith-base-5.8.0/createlinks 2020-11-11 15:35:44.424000000 -0500
4     @@ -34,12 +34,6 @@
5     ));
6     }
7    
8     -safe_symlink("daemontools", "root/etc/rc.d/init.d/wan");
9     -service_link_enhanced("wan", "S37", "7");
10     -service_link_enhanced("wan", "K90", "6");
11     -service_link_enhanced("wan", "K90", "0");
12     -service_link_enhanced("wan", "K90", "1");
13     -
14     # conf-dialup
15     foreach (qw(
16     /etc/sysconfig/network-scripts/ifcfg-ppp0
17     @@ -322,6 +316,7 @@
18     event_link("create-mnt-floppy", $event, "50");
19     event_link("conf-routes", $event, "89");
20     event_link("systemd-isolate", $event, "94");
21     +event_link("systemd-reload", $event, "94");
22     event_link("reset-unsavedflag", $event, "95");
23    
24     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network");
25     @@ -342,6 +337,7 @@
26     event_link("set-hostname", $event, "10");
27     event_link("conf-modules", $event, "30");
28     event_link("conf-startup", $event, "60");
29     +event_link("systemd-reload", $event, "94");
30     event_link("reset-unsavedflag", $event, "95");
31    
32     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan");
33     @@ -373,6 +369,7 @@
34     event_link("systemd-default", $event, "05");
35     event_link("user-lock-passwd", $event, "15");
36     event_link("user-modify-unix", $event, "15");
37     +event_link("systemd-reload", $event, "94");
38    
39     #--------------------------------------------------
40     # actions for group-create event
41     @@ -446,6 +443,7 @@
42     event_link("conf-startup", $event, "10");
43     event_link("conf-modules", $event, "30");
44     event_link("create-mnt-floppy", $event, "50");
45     +event_link("systemd-reload", $event, "94");
46    
47     #--------------------------------------------------
48     # actions for post-upgrade event
49     @@ -465,6 +463,7 @@
50     event_link("conf-modules", $event, "30");
51     event_link("create-mnt-floppy", $event, "50");
52     event_link("copy-anaconda-logs", $event, "90");
53     +event_link("systemd-reload", $event, "94");
54    
55     #--------------------------------------------------
56     # actions for reboot event
57     @@ -607,7 +606,6 @@
58     (
59     # Start rsyslog up before network!
60     raidmonitor => "15",
61     - network => "37",
62     dhcpd => "65",
63     'local' => "99",
64     );
65     @@ -658,6 +656,8 @@
66     systemd-logind.service
67     systemd-update-utmp-runlevel.service
68     systemd-user-sessions.service
69     + networking.service
70     + wan.service
71     ))
72     {
73     symlink("../$unit",
74     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default
75     --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default 2020-11-11 14:07:33.347000000 -0500
76     +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default 2020-11-11 14:50:01.589000000 -0500
77     @@ -1,5 +1,5 @@
78     #!/usr/bin/bash
79     /usr/bin/systemctl enable sme-server.target
80     +ln -fs sme-server.target /lib/systemd/system/default.target
81     +/usr/bin/systemctl preset-all
82     /usr/bin/systemctl set-default sme-server.target
83     -# /usr/bin/systemctl disable multi-user.target
84     -
85     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-reload e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-reload
86     --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-reload 1969-12-31 19:00:00.000000000 -0500
87     +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-reload 2020-11-11 14:51:32.777000000 -0500
88     @@ -0,0 +1,2 @@
89     +#!/usr/bin/bash
90     +/usr/bin/systemctl daemon-reload
91     diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/networking.service e-smith-base-5.8.0/root/usr/lib/systemd/system/networking.service
92     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/networking.service 1969-12-31 19:00:00.000000000 -0500
93     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/networking.service 2020-11-11 14:54:37.816000000 -0500
94     @@ -0,0 +1,17 @@
95     +[Unit]
96     +Description= Network management for Koozali SME Server, using old sysvinit script
97     +After=network-pre.target
98     +Wants=network.target
99     +Before=network-online.target wan.service
100     +Conflicts=NetworkManager.service
101     +
102     +[Service]
103     +Type=oneshot
104     +ExecStart=/etc/rc.d/init.d/network start
105     +ExecStop=/etc/rc.d/init.d/network stop
106     +ExecReload=/etc/rc.d/init.d/network restart
107     +RemainAfterExit=yes
108     +
109     +[Install]
110     +WantedBy=sme-server.target
111     +Alias=network.service
112     diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service
113     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/wan.service 1969-12-31 19:00:00.000000000 -0500
114     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/wan.service 2020-11-11 15:32:34.522000000 -0500
115     @@ -0,0 +1,15 @@
116     +[Unit]
117     +Description=WAN interface for Koozali SME Server
118     +After=network-pre.target networking.service
119     +Before=network-online.target
120     +
121     +[Service]
122     +Type=oneshot
123     +ExecStartPre=/sbin/e-smith/service-status wan
124     +ExecStart=/usr/bin/sv u /service/wan
125     +ExecStop=/usr/bin/sv stop /service/wan
126     +ExecReload=/usr/bin/sv t /service/wan
127     +RemainAfterExit=yes
128     +
129     +[Install]
130     +WantedBy=sme-server.target
131     diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50koozali.preset
132     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50koozali.preset 1969-12-31 19:00:00.000000000 -0500
133     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50koozali.preset 2020-11-11 15:34:43.681000000 -0500
134     @@ -0,0 +1,18 @@
135     +enable sme-server.target
136     +disable multi-user.target
137     +disable graphical.target
138     +
139     +enable runit.service
140     +enable bootstrap-console.service
141     +enable networking.service
142     +enable wan.service
143     +enable masq.service
144     +enable php-fpm.service
145     +enable php55-php-fpm.service
146     +enable php56-php-fpm.service
147     +enable php70-php-fpm.service
148     +enable php71-php-fpm.service
149     +enable php72-php-fpm.service
150     +enable php73-php-fpm.service
151     +enable php74-php-fpm.service
152     +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed