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	2021-01-11 01:11:47.303000000 -0500
+++ e-smith-base-5.8.0/createlinks	2021-01-11 03:42:51.165000000 -0500
@@ -623,7 +623,7 @@
 system('mkdir -p root/usr/lib/systemd/system/'.$target.'.target.wants/');
         unlink "root/usr/lib/systemd/system/$target.target.wants/bootstrap-console.service";
 
-foreach my $unit (qw(bootstrap-console.service 
+foreach my $unit (qw(
 	dbus.service 
 	getty.target 
 	plymouth-quit.service 
@@ -641,6 +639,12 @@
         or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!";
 	}
 }
+$unit="bootstrap-console.service";
+$target="basic";
+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: $!";
+
 symlink("mdmonitor.service",
                 "root/usr/lib/systemd/system/raidmonitor.service");
 
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services e-smith-base-5.8.0/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services
--- e-smith-base-5.8.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services	2021-01-11 01:11:47.305000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/templates/usr/lib/systemd/system/sme-server.target.d/50koozali.conf/20services	2021-01-11 03:38:06.324000000 -0500
@@ -10,6 +10,8 @@
     $status = "disable" if  -e "/etc/rc.d/init.d/".$service->key || -e "/etc/rc.d/init.d/supervise/".$service->key;
     }
   next unless -e "/usr/lib/systemd/system/$servicename" || -e "/etc/lib/systemd/system/$servicename";
+  # bootstrap-console is wantedby basic.target
+  next if ($servicename eq "bootstrap-console.service");
   # we could also filter out there services that have already WantedBy=.*sme-server.target in their unit file or in a drop-in 
 
   $OUT .= "$servicename " if ($status eq "enable");
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-console.service e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-console.service
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-console.service	2021-01-11 01:11:47.228000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-console.service	2021-01-11 03:00:50.176000000 -0500
@@ -6,6 +6,7 @@
 After=systemd-vconsole-setup.service
 Before=getty@tty1.service
 Before=shutdown.target
+Before=network.target network-online.target  network-pre.target
 
 [Service]
 Environment=HOME=/root
@@ -23,5 +24,4 @@
 SendSIGHUP=yes
 
 [Install]
-WantedBy=multi-user.target
-WantedBy=sme-server.target
+WantedBy=basic.target
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-runlevel7.service e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-runlevel7.service
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-runlevel7.service	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-runlevel7.service	2021-01-11 03:01:23.012000000 -0500
@@ -0,0 +1,27 @@
+[Unit]
+Description=SME server bootstrap-runlevel7 to start old SME rc7.d services
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=livesys.service plymouth-quit-wait.service
+After=systemd-vconsole-setup.service
+After=basic.target bootstrap-console.service
+Before=getty@tty1.service
+Before=shutdown.target
+
+[Service]
+Environment=HOME=/root
+WorkingDirectory=/root
+ExecStartPre=-/bin/plymouth quit
+ExecStart=/sbin/e-smith/bootstrap-runlevel7
+Type=oneshot
+Restart=no
+TimeoutSec=0
+StandardInput=tty
+StandardOutput=tty
+StandardError=tty
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes
+
+[Install]
+WantedBy=sme-server.target
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/status
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/status	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/status	2021-01-11 03:49:10.495000000 -0500
@@ -0,0 +1 @@
+enabled
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/type
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/type	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/type	2021-01-11 03:49:02.843000000 -0500
@@ -0,0 +1 @@
+service