--- rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch	2020/10/22 20:33:16	1.8
+++ rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz10957.sme-server.target.patch	2020/10/22 21:42:32	1.11
@@ -9,7 +9,7 @@ diff -Nur e-smith-base-5.8.0.old/createl
  event_link("rotate_timestamped_logfiles", $event, "05");
  event_link("init-accounts", $event, "05");
  event_link("set-hostname", $event, "10");
-@@ -320,7 +321,9 @@
+@@ -320,7 +321,8 @@
  event_link("conf-modules", $event, "30");
  event_link("create-mnt-floppy", $event, "50");
  event_link("conf-routes", $event, "89");
@@ -17,7 +17,6 @@ diff -Nur e-smith-base-5.8.0.old/createl
 +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");
 @@ -333,6 +335,7 @@
@@ -152,3 +151,50 @@ diff -Nur e-smith-base-5.8.0.old/root/sb
  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");
+   }
+ }
++}
+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:32:27.941000000 -0400
++++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/fix-startup	2020-10-22 17:41:30.255000000 -0400
+@@ -33,7 +33,7 @@
+   }
+   elsif (-e "/etc/init.d/$sv")
+   {
+-    system("/usr/sbin/chkconfig", $sv, "off");
++    my $dropoutput = `/usr/sbin/chkconfig $sv off 2>/dev/null`;
+   }
+ }
+ }