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-09-30 15:31:18.288000000 -0400 |
3 |
|
|
+++ e-smith-base-5.8.0/createlinks 2020-09-30 16:19:33.419000000 -0400 |
4 |
|
|
@@ -308,6 +308,7 @@ |
5 |
|
|
templates2events("/etc/smartd.conf", $event); |
6 |
|
|
templates2events("/home/e-smith/ssl.pem/pem", $event); |
7 |
|
|
event_link("fix-startup", $event, "05"); |
8 |
|
|
+event_link("systemd-default", $event, "05"); |
9 |
|
|
event_link("rotate_timestamped_logfiles", $event, "05"); |
10 |
|
|
event_link("init-accounts", $event, "05"); |
11 |
|
|
event_link("set-hostname", $event, "10"); |
12 |
|
|
@@ -320,7 +321,8 @@ |
13 |
|
|
event_link("conf-modules", $event, "30"); |
14 |
|
|
event_link("create-mnt-floppy", $event, "50"); |
15 |
|
|
event_link("conf-routes", $event, "89"); |
16 |
|
|
-event_link("reset-unsavedflag", $event, "95") |
17 |
|
|
+event_link("systemd-isolate", $event, "94"); |
18 |
jpp |
1.2 |
+event_link("reset-unsavedflag", $event, "95"); |
19 |
jpp |
1.1 |
|
20 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan"); |
21 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); |
22 |
|
|
@@ -333,6 +335,7 @@ |
23 |
|
|
|
24 |
|
|
templates2events("/etc/smartd.conf", $event); |
25 |
|
|
templates2events("/home/e-smith/ssl.pem/pem", $event); |
26 |
|
|
+event_link("systemd-default", $event, "05"); |
27 |
|
|
event_link("set-hostname", $event, "10"); |
28 |
|
|
event_link("conf-modules", $event, "30"); |
29 |
|
|
event_link("conf-startup", $event, "60"); |
30 |
|
|
@@ -349,6 +352,7 @@ |
31 |
|
|
|
32 |
|
|
templates2events("/etc/smartd.conf", $event); |
33 |
|
|
templates2events("/home/e-smith/ssl.pem/pem", $event); |
34 |
|
|
+event_link("systemd-default", $event, "05"); |
35 |
|
|
event_link("rmmod-bonding", $event, "10"); |
36 |
|
|
event_link("set-hostname", $event, "10"); |
37 |
|
|
event_link("conf-modules", $event, "30"); |
38 |
|
|
@@ -363,6 +367,7 @@ |
39 |
|
|
|
40 |
|
|
templates2events("/etc/nsswitch.conf", $event); |
41 |
|
|
templates2events("/etc/pam.d/system-auth", $event); |
42 |
|
|
+event_link("systemd-default", $event, "05"); |
43 |
|
|
event_link("user-lock-passwd", $event, "15"); |
44 |
|
|
event_link("user-modify-unix", $event, "15"); |
45 |
|
|
|
46 |
|
|
@@ -396,6 +401,7 @@ |
47 |
|
|
|
48 |
|
|
$event = "halt"; |
49 |
|
|
|
50 |
|
|
+event_link("systemd-default", $event, "05"); |
51 |
|
|
event_link("halt", $event, "70"); |
52 |
|
|
|
53 |
|
|
#-------------------------------------------------- |
54 |
|
|
@@ -430,6 +436,7 @@ |
55 |
|
|
$event = "post-install"; |
56 |
|
|
|
57 |
|
|
event_link("fix-startup", $event, "05"); |
58 |
|
|
+event_link("systemd-default", $event, "05"); |
59 |
|
|
event_link("rotate_timestamped_logfiles", $event, "05"); |
60 |
|
|
event_link("init-accounts", $event, "05"); |
61 |
|
|
event_link("init-passwords", $event, "10"); |
62 |
|
|
@@ -444,6 +451,7 @@ |
63 |
|
|
$event = "post-upgrade"; |
64 |
|
|
|
65 |
|
|
event_link("fix-startup", $event, "05"); |
66 |
|
|
+event_link("systemd-default", $event, "05"); |
67 |
|
|
event_link("rotate_timestamped_logfiles", $event, "05"); |
68 |
|
|
event_link("init-accounts", $event, "05"); |
69 |
|
|
event_link("conf-startup", $event, "10"); |
70 |
|
|
@@ -461,6 +469,7 @@ |
71 |
|
|
|
72 |
|
|
$event = "reboot"; |
73 |
|
|
|
74 |
|
|
+event_link("systemd-default", $event, "05"); |
75 |
|
|
safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/wan"); |
76 |
|
|
event_link("reboot", $event, "99"); |
77 |
|
|
|
78 |
|
|
@@ -632,11 +641,27 @@ |
79 |
|
|
safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin"); |
80 |
|
|
|
81 |
|
|
|
82 |
|
|
-system('mkdir -p root/usr/lib/systemd/system/multi-user.target.wants/'); |
83 |
|
|
- unlink "root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service"; |
84 |
|
|
-symlink("/usr/lib/systemd/system/bootstrap-console.service", |
85 |
|
|
- "root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service") |
86 |
|
|
- or die "Can't symlink to root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service: $!"; |
87 |
|
|
+foreach my $target (qw(multi-user sme-server)) |
88 |
|
|
+{ |
89 |
|
|
+system('mkdir -p root/usr/lib/systemd/system/'.$target.'.target.wants/'); |
90 |
|
|
+ unlink "root/usr/lib/systemd/system/$target.target.wants/bootstrap-console.service"; |
91 |
|
|
+ |
92 |
|
|
+foreach my $unit (qw(bootstrap-console.service |
93 |
|
|
+ dbus.service |
94 |
|
|
+ getty.target |
95 |
|
|
+ plymouth-quit.service |
96 |
|
|
+ plymouth-quit-wait.service |
97 |
|
|
+ systemd-ask-password-wall.path |
98 |
|
|
+ systemd-logind.service |
99 |
|
|
+ systemd-update-utmp-runlevel.service |
100 |
|
|
+ systemd-user-sessions.service |
101 |
|
|
+ )) |
102 |
|
|
+ { |
103 |
|
|
+ symlink("../bootstrap-console.service", |
104 |
|
|
+ "root/usr/lib/systemd/system/$target.target.wants/$unit") |
105 |
|
|
+ or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!"; |
106 |
|
|
+ } |
107 |
|
|
+} |
108 |
|
|
|
109 |
|
|
# languages links |
110 |
|
|
foreach (qw(fr-be fr-lu fr-mc fr-ch)) |
111 |
|
|
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 |
112 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default 1969-12-31 19:00:00.000000000 -0500 |
113 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default 2020-09-30 16:14:10.291000000 -0400 |
114 |
|
|
@@ -0,0 +1,5 @@ |
115 |
|
|
+#!/usr/bin/bash |
116 |
|
|
+/usr/bin/systemctl enable sme-server.target |
117 |
|
|
+/usr/bin/systemctl set-default sme-server.target |
118 |
|
|
+# /usr/bin/systemctl disable multi-user.target |
119 |
|
|
+ |
120 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate |
121 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate 1969-12-31 19:00:00.000000000 -0500 |
122 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate 2020-09-30 16:13:55.794000000 -0400 |
123 |
|
|
@@ -0,0 +1,2 @@ |
124 |
|
|
+#!/usr/bin/bash |
125 |
|
|
+/usr/bin/systemctl isolate sme-server.target |
126 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/sme-server.target e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target |
127 |
|
|
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/sme-server.target 1969-12-31 19:00:00.000000000 -0500 |
128 |
|
|
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target 2020-09-30 15:33:14.457000000 -0400 |
129 |
|
|
@@ -0,0 +1,10 @@ |
130 |
|
|
+# This file is part of Koozali SME Server. |
131 |
|
|
+# |
132 |
|
|
+ |
133 |
|
|
+[Unit] |
134 |
|
|
+Description=Koozali SME Server System |
135 |
|
|
+Documentation=man:systemd.special(7) |
136 |
|
|
+Requires=basic.target getty.target nfs-client.target remote-fs.target |
137 |
|
|
+Conflicts=rescue.service rescue.target multi-user.target |
138 |
|
|
+After=basic.target rescue.service rescue.target |
139 |
|
|
+AllowIsolate=yes |
140 |
jpp |
1.2 |
+Wants=acpid.service atd.service auditd.service avahi-daemon.service brandbot.path crond.service irqbalance.service nfs-client.target remote-fs.target rhel-configure.service rsyslog.service smartd.service yum-cron.service |