/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch

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

Revision 1.11 - (hide annotations) (download)
Thu Oct 22 21:42:32 2020 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-71_el7_sme, e-smith-base-5_8_0-67_el7_sme, e-smith-base-5_8_0-64_el7_sme, e-smith-base-5_8_0-69_el7_sme, e-smith-base-5_8_0-70_el7_sme, e-smith-base-5_8_0-60_el7_sme, e-smith-base-5_8_0-65_el7_sme, e-smith-base-5_8_0-83_el7_sme, e-smith-base-5_8_0-96_el7_sme, e-smith-base-5_8_0-95_el7_sme, e-smith-base-5_8_0-80_el7_sme, e-smith-base-5_8_0-85_el7_sme, e-smith-base-5_8_0-50_el7_sme, e-smith-base-5_8_0-81_el7_sme, e-smith-base-5_8_0-82_el7_sme, e-smith-base-5_8_0-88_el7_sme, e-smith-base-5_8_0-54_el7_sme, e-smith-base-5_8_0-99_el7_sme, e-smith-base-5_8_0-94_el7_sme, e-smith-base-5_8_0-98_el7_sme, e-smith-base-5_8_0-97_el7_sme, e-smith-base-5_8_0-92_el7_sme, e-smith-base-5_8_0-75_el7_sme, e-smith-base-5_8_0-78_el7_sme, e-smith-base-5_8_0-90_el7_sme, e-smith-base-5_8_0-93_el7_sme, e-smith-base-5_8_0-55_el7_sme, e-smith-base-5_8_0-61_el7_sme, e-smith-base-5_8_0-52_el7_sme, e-smith-base-5_8_0-62_el7_sme, e-smith-base-5_8_0-74_el7_sme, e-smith-base-5_8_0-77_el7_sme, e-smith-base-5_8_0-63_el7_sme, e-smith-base-5_8_0-73_el7_sme, e-smith-base-5_8_0-76_el7_sme, e-smith-base-5_8_0-79_el7_sme, e-smith-base-5_8_0-91_el7_sme, e-smith-base-5_8_0-58_el7_sme, e-smith-base-5_8_0-86_el7_sme, e-smith-base-5_8_0-59_el7_sme, e-smith-base-5_8_0-87_el7_sme, e-smith-base-5_8_0-53_el7_sme, e-smith-base-5_8_0-49_el7_sme, e-smith-base-5_8_0-48_el7_sme, e-smith-base-5_8_0-66_el7_sme, e-smith-base-5_8_0-68_el7_sme, e-smith-base-5_8_0-72_el7_sme, e-smith-base-5_8_0-84_el7_sme, e-smith-base-5_8_0-89_el7_sme, e-smith-base-5_8_0-51_el7_sme
Changes since 1.10: +12 -0 lines 
* Wed Sep 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-48.sme
- create e-smith-base-update event [SME: 11012]
- create sme-server.target [SME: 10957]
  make sme-server.target default target
  change default target on  signal-event post-upgrade, post-install, e-smith-base-update
  requires update or smeserver-php and e-smith-runit
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 jpp 1.9 @@ -320,7 +321,8 @@
13 jpp 1.1 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 jpp 1.4 + symlink("../$unit",
104 jpp 1.1 + "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 jpp 1.7 @@ -0,0 +1,3 @@
124 jpp 1.1 +#!/usr/bin/bash
125     +/usr/bin/systemctl isolate sme-server.target
126 jpp 1.7 +/usr/bin/systemctl daemon-reload
127 jpp 1.1 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
128     --- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/sme-server.target 1969-12-31 19:00:00.000000000 -0500
129     +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target 2020-09-30 15:33:14.457000000 -0400
130 jpp 1.3 @@ -0,0 +1,11 @@
131 jpp 1.1 +# This file is part of Koozali SME Server.
132     +#
133     +
134     +[Unit]
135     +Description=Koozali SME Server System
136     +Documentation=man:systemd.special(7)
137 jpp 1.5 +Requires=basic.target
138 jpp 1.1 +Conflicts=rescue.service rescue.target multi-user.target
139     +After=basic.target rescue.service rescue.target
140     +AllowIsolate=yes
141 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
142 jpp 1.6 diff -Nur e-smith-base-5.8.0.old/root/sbin/e-smith/service e-smith-base-5.8.0/root/sbin/e-smith/service
143     --- e-smith-base-5.8.0.old/root/sbin/e-smith/service 2020-10-01 11:15:37.118000000 -0400
144     +++ e-smith-base-5.8.0/root/sbin/e-smith/service 2020-10-01 11:21:11.608000000 -0400
145     @@ -15,7 +15,7 @@
146     exit
147     fi
148    
149     -if [ "$runlevel" = "multi-user.target" ]
150     +if [ "$runlevel" = "multi-user.target" ] || [ "$runlevel" = "sme-server.target" ]
151     then
152     if ls /etc/rc7.d/S??$1 >/dev/null 2>/dev/null
153     then
154 jpp 1.10 diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
155     --- e-smith-base-5.8.0.old/createlinks 2020-10-22 17:02:59.442000000 -0400
156     +++ e-smith-base-5.8.0/createlinks 2020-10-22 17:03:44.316000000 -0400
157     @@ -324,6 +324,7 @@
158     event_link("systemd-isolate", $event, "94");
159     event_link("reset-unsavedflag", $event, "95");
160    
161     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network");
162     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan");
163     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd");
164     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
165     diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/fix-startup e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup
166     --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:02:59.317000000 -0400
167     +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:16:25.871000000 -0400
168     @@ -21,11 +21,13 @@
169     my $sv=$service->{'name'};
170     next if $sv eq 'bootstrap-console';
171     $sv= $equivalent->{$sv} || $sv;
172     - if (-e "/lib/systemd/system/multi-user.target.wants/$sv.service")
173     +foreach (qw(multi-user sme-server))
174     +{
175     + if (-e "/lib/systemd/system/$_.target.wants/$sv.service")
176     {
177     system(qw(systemctl disable), $sv);
178     }
179     - elsif (-e "/etc/systemd/system/multi-user.target.wants/$sv.service")
180     + elsif (-e "/etc/systemd/system/$_.target.wants/$sv.service")
181     {
182     system(qw(systemctl disable), $sv);
183     }
184     @@ -34,3 +36,4 @@
185     system("/usr/sbin/chkconfig", $sv, "off");
186     }
187     }
188     +}
189 jpp 1.11 diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/fix-startup e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup
190     --- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:32:27.941000000 -0400
191     +++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:41:30.255000000 -0400
192     @@ -33,7 +33,7 @@
193     }
194     elsif (-e "/etc/init.d/$sv")
195     {
196     - system("/usr/sbin/chkconfig", $sv, "off");
197     + my $dropoutput = `/usr/sbin/chkconfig $sv off 2>/dev/null`;
198     }
199     }
200     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed