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

Diff 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 | View Patch Patch

Revision 1.5 by jpp, Thu Oct 1 13:15:22 2020 UTC Revision 1.11 by jpp, Thu Oct 22 21:42:32 2020 UTC
# Line 120  diff -Nur e-smith-base-5.8.0.old/root/et Line 120  diff -Nur e-smith-base-5.8.0.old/root/et
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  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  --- 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  +++ 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 @@  @@ -0,0 +1,3 @@
124  +#!/usr/bin/bash  +#!/usr/bin/bash
125  +/usr/bin/systemctl isolate sme-server.target  +/usr/bin/systemctl isolate sme-server.target
126    +/usr/bin/systemctl daemon-reload
127  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  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  --- 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  +++ e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target    2020-09-30 15:33:14.457000000 -0400
# Line 138  diff -Nur e-smith-base-5.8.0.old/root/us Line 139  diff -Nur e-smith-base-5.8.0.old/root/us
139  +After=basic.target rescue.service rescue.target  +After=basic.target rescue.service rescue.target
140  +AllowIsolate=yes  +AllowIsolate=yes
141  +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  +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    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    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    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     }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed