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

Contents of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11090-networking.service.patch

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


Revision 1.2 - (show annotations) (download)
Sun Jun 6 20:38:26 2021 UTC (3 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
Error occurred while calculating annotation data.
FILE REMOVED
5.8.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:03:57.254000000 -0500
4 @@ -322,6 +322,7 @@
5 event_link("create-mnt-floppy", $event, "50");
6 event_link("conf-routes", $event, "89");
7 event_link("systemd-isolate", $event, "94");
8 +event_link("systemd-reload", $event, "94");
9 event_link("reset-unsavedflag", $event, "95");
10
11 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network");
12 @@ -342,6 +343,7 @@
13 event_link("set-hostname", $event, "10");
14 event_link("conf-modules", $event, "30");
15 event_link("conf-startup", $event, "60");
16 +event_link("systemd-reload", $event, "94");
17 event_link("reset-unsavedflag", $event, "95");
18
19 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan");
20 @@ -373,6 +375,7 @@
21 event_link("systemd-default", $event, "05");
22 event_link("user-lock-passwd", $event, "15");
23 event_link("user-modify-unix", $event, "15");
24 +event_link("systemd-reload", $event, "94");
25
26 #--------------------------------------------------
27 # actions for group-create event
28 @@ -446,6 +449,7 @@
29 event_link("conf-startup", $event, "10");
30 event_link("conf-modules", $event, "30");
31 event_link("create-mnt-floppy", $event, "50");
32 +event_link("systemd-reload", $event, "94");
33
34 #--------------------------------------------------
35 # actions for post-upgrade event
36 @@ -465,6 +469,7 @@
37 event_link("conf-modules", $event, "30");
38 event_link("create-mnt-floppy", $event, "50");
39 event_link("copy-anaconda-logs", $event, "90");
40 +event_link("systemd-reload", $event, "94");
41
42 #--------------------------------------------------
43 # actions for reboot event
44 @@ -607,7 +612,6 @@
45 (
46 # Start rsyslog up before network!
47 raidmonitor => "15",
48 - network => "37",
49 dhcpd => "65",
50 'local' => "99",
51 );
52 @@ -658,6 +662,7 @@
53 systemd-logind.service
54 systemd-update-utmp-runlevel.service
55 systemd-user-sessions.service
56 + networking.service
57 ))
58 {
59 symlink("../$unit",
60 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
61 --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default 2020-11-11 14:07:33.347000000 -0500
62 +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default 2020-11-11 14:50:01.589000000 -0500
63 @@ -1,5 +1,5 @@
64 #!/usr/bin/bash
65 /usr/bin/systemctl enable sme-server.target
66 +ln -fs sme-server.target /lib/systemd/system/default.target
67 +/usr/bin/systemctl preset-all
68 /usr/bin/systemctl set-default sme-server.target
69 -# /usr/bin/systemctl disable multi-user.target
70 -
71 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
72 --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-reload 1969-12-31 19:00:00.000000000 -0500
73 +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-reload 2020-11-11 14:51:32.777000000 -0500
74 @@ -0,0 +1,2 @@
75 +#!/usr/bin/bash
76 +/usr/bin/systemctl daemon-reload
77 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
78 --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/networking.service 1969-12-31 19:00:00.000000000 -0500
79 +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/networking.service 2020-11-11 14:54:37.816000000 -0500
80 @@ -0,0 +1,17 @@
81 +[Unit]
82 +Description= Network management for Koozali SME Server, using old sysvinit script
83 +After=network-pre.target
84 +Wants=network.target
85 +Before=network-online.target wan.service
86 +Conflicts=NetworkManager.service
87 +
88 +[Service]
89 +Type=oneshot
90 +ExecStart=/etc/rc.d/init.d/network start
91 +ExecStop=/etc/rc.d/init.d/network stop
92 +ExecReload=/etc/rc.d/init.d/network restart
93 +RemainAfterExit=yes
94 +
95 +[Install]
96 +WantedBy=sme-server.target
97 +Alias=network.service
98 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
99 --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50koozali.preset 1969-12-31 19:00:00.000000000 -0500
100 +++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50koozali.preset 2020-11-11 14:38:44.471000000 -0500
101 @@ -0,0 +1,18 @@
102 +enable sme-server.target
103 +disable multi-user.target
104 +disable graphical.target
105 +
106 +enable runit.service
107 +enable bootstrap-console.service
108 +enable networking.service
109 +enable wan.service
110 +enable masq.service
111 +enable php-fpm.service
112 +enable php55-php-fpm.service
113 +enable php56-php-fpm.service
114 +enable php70-php-fpm.service
115 +enable php71-php-fpm.service
116 +enable php72-php-fpm.service
117 +enable php73-php-fpm.service
118 +enable php74-php-fpm.service
119 +

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