--- rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch 2020/09/30 20:38:11 1.2 +++ rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch 2020/10/22 21:17:19 1.10 @@ -100,7 +100,7 @@ diff -Nur e-smith-base-5.8.0.old/createl + systemd-user-sessions.service + )) + { -+ symlink("../bootstrap-console.service", ++ symlink("../$unit", + "root/usr/lib/systemd/system/$target.target.wants/$unit") + or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!"; + } @@ -120,21 +120,69 @@ diff -Nur e-smith-base-5.8.0.old/root/et 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 --- 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/root/etc/e-smith/events/actions/systemd-isolate 2020-09-30 16:13:55.794000000 -0400 -@@ -0,0 +1,2 @@ +@@ -0,0 +1,3 @@ +#!/usr/bin/bash +/usr/bin/systemctl isolate sme-server.target ++/usr/bin/systemctl daemon-reload 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 --- 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/root/usr/lib/systemd/system/sme-server.target 2020-09-30 15:33:14.457000000 -0400 -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +# This file is part of Koozali SME Server. +# + +[Unit] +Description=Koozali SME Server System +Documentation=man:systemd.special(7) -+Requires=basic.target getty.target nfs-client.target remote-fs.target ++Requires=basic.target +Conflicts=rescue.service rescue.target multi-user.target +After=basic.target rescue.service rescue.target +AllowIsolate=yes +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 +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 +--- e-smith-base-5.8.0.old/root/sbin/e-smith/service 2020-10-01 11:15:37.118000000 -0400 ++++ e-smith-base-5.8.0/root/sbin/e-smith/service 2020-10-01 11:21:11.608000000 -0400 +@@ -15,7 +15,7 @@ + exit + fi + +-if [ "$runlevel" = "multi-user.target" ] ++if [ "$runlevel" = "multi-user.target" ] || [ "$runlevel" = "sme-server.target" ] + then + if ls /etc/rc7.d/S??$1 >/dev/null 2>/dev/null + then +diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks +--- e-smith-base-5.8.0.old/createlinks 2020-10-22 17:02:59.442000000 -0400 ++++ e-smith-base-5.8.0/createlinks 2020-10-22 17:03:44.316000000 -0400 +@@ -324,6 +324,7 @@ + event_link("systemd-isolate", $event, "94"); + event_link("reset-unsavedflag", $event, "95"); + ++safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); +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 +--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:02:59.317000000 -0400 ++++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup 2020-10-22 17:16:25.871000000 -0400 +@@ -21,11 +21,13 @@ + my $sv=$service->{'name'}; + next if $sv eq 'bootstrap-console'; + $sv= $equivalent->{$sv} || $sv; +- if (-e "/lib/systemd/system/multi-user.target.wants/$sv.service") ++foreach (qw(multi-user sme-server)) ++{ ++ if (-e "/lib/systemd/system/$_.target.wants/$sv.service") + { + system(qw(systemctl disable), $sv); + } +- elsif (-e "/etc/systemd/system/multi-user.target.wants/$sv.service") ++ elsif (-e "/etc/systemd/system/$_.target.wants/$sv.service") + { + system(qw(systemctl disable), $sv); + } +@@ -34,3 +36,4 @@ + system("/usr/sbin/chkconfig", $sv, "off"); + } + } ++}