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-12-09 11:03:25.563000000 -0500
+++ e-smith-base-5.8.0/createlinks	2020-12-09 11:41:07.555000000 -0500
@@ -607,34 +607,11 @@
 $event = "email-update";
 
 
-my %service2order =
-(
-    # Start rsyslog up before network!
-    'local'    	=> "99",
-);
-
-foreach my $service (keys %service2order)
-{
-    service_link_enhanced($service, $service2order{$service}, 7);
-}
-
-
-foreach my $service (keys %service2order)
-{
-    service_link_enhanced($service, $service2order{$service}, 0);
-    service_link_enhanced($service, $service2order{$service}, 6);
-    service_link_enhanced($service, $service2order{$service}, 1);
-}
-
 # Set up links to daemontools.
 
 safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPHostname");
 safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPEthernetAddress");
 
-# Local event
-safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/local");
-safe_symlink("/var/service/local" , 'root/service/local');
-safe_touch("root/var/service/local/down");
 
 # no template headers for /etc/pam_ldap.secret
 safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin");
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service	2020-12-09 11:19:00.868000000 -0500
@@ -0,0 +1,14 @@
+[Unit]
+Description=Local service for Koozali SME Server
+After=network-pre.target networking.service
+
+[Service]
+Type=oneshot
+ExecStartPre=/sbin/e-smith/service-status local
+ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local
+ExecStart=/sbin/e-smith/signal-event local
+ExecStart=/usr/bin/systemctl restart rc-local.service
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sme-server.target
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-12-09 22:24:31.760000000 -0500
+++ e-smith-base-5.8.0/createlinks	2020-12-09 22:33:47.569000000 -0500
@@ -579,6 +579,7 @@
 #--------------------------------------------------
 
 $event = "local";
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rc-local");
 
 #--------------------------------------------------
 # actions for ldap-update event
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status	2020-12-09 22:30:03.095000000 -0500
@@ -0,0 +1 @@
+enabled
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type	2020-12-09 22:29:53.888000000 -0500
@@ -0,0 +1 @@
+configuration
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service	2020-12-09 22:24:31.778000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service	2020-12-09 22:31:09.422000000 -0500
@@ -7,7 +7,6 @@
 ExecStartPre=/sbin/e-smith/service-status local
 ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local
 ExecStart=/sbin/e-smith/signal-event local
-ExecStart=/usr/bin/systemctl restart rc-local.service
 RemainAfterExit=yes
 
 [Install]
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset	2020-12-09 22:24:31.756000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset	2020-12-09 22:32:19.660000000 -0500
@@ -35,6 +35,8 @@
 enable ldap.service
 enable ldap.init.service
 enable local.service
+enable yum.service
+disable rc-local.service
 
 #need to change after integration
 #enable mariadb.service
@@ -65,7 +67,6 @@
 disable squid.service
 disable sshd.service
 enable tinydns.service
-enable wan.service
 disable nut-server.service
 disable nut-monitor.service
 disable ntpdate.service