| 1 |
diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks |
| 2 |
--- e-smith-base-5.8.0.old/createlinks 2021-01-11 01:11:47.303000000 -0500 |
| 3 |
+++ e-smith-base-5.8.0/createlinks 2021-01-11 03:42:51.165000000 -0500 |
| 4 |
@@ -623,7 +623,7 @@ |
| 5 |
system('mkdir -p root/usr/lib/systemd/system/'.$target.'.target.wants/'); |
| 6 |
unlink "root/usr/lib/systemd/system/$target.target.wants/bootstrap-console.service"; |
| 7 |
|
| 8 |
-foreach my $unit (qw(bootstrap-console.service |
| 9 |
+foreach my $unit (qw( |
| 10 |
dbus.service |
| 11 |
getty.target |
| 12 |
plymouth-quit.service |
| 13 |
@@ -641,6 +639,12 @@ |
| 14 |
or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!"; |
| 15 |
} |
| 16 |
} |
| 17 |
+$unit="bootstrap-console.service"; |
| 18 |
+$target="basic"; |
| 19 |
+symlink("../$unit", |
| 20 |
+ "root/usr/lib/systemd/system/$target.target.wants/$unit") |
| 21 |
+ or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!"; |
| 22 |
+ |
| 23 |
symlink("mdmonitor.service", |
| 24 |
"root/usr/lib/systemd/system/raidmonitor.service"); |
| 25 |
|
| 26 |
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 |
| 27 |
--- 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 |
| 28 |
+++ 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 |
| 29 |
@@ -10,6 +10,8 @@ |
| 30 |
$status = "disable" if -e "/etc/rc.d/init.d/".$service->key || -e "/etc/rc.d/init.d/supervise/".$service->key; |
| 31 |
} |
| 32 |
next unless -e "/usr/lib/systemd/system/$servicename" || -e "/etc/lib/systemd/system/$servicename"; |
| 33 |
+ # bootstrap-console is wantedby basic.target |
| 34 |
+ next if ($servicename eq "bootstrap-console.service"); |
| 35 |
# we could also filter out there services that have already WantedBy=.*sme-server.target in their unit file or in a drop-in |
| 36 |
|
| 37 |
$OUT .= "$servicename " if ($status eq "enable"); |
| 38 |
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 |
| 39 |
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-console.service 2021-01-11 01:11:47.228000000 -0500 |
| 40 |
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-console.service 2021-01-11 03:00:50.176000000 -0500 |
| 41 |
@@ -6,6 +6,7 @@ |
| 42 |
After=systemd-vconsole-setup.service |
| 43 |
Before=getty@tty1.service |
| 44 |
Before=shutdown.target |
| 45 |
+Before=network.target network-online.target network-pre.target |
| 46 |
|
| 47 |
[Service] |
| 48 |
Environment=HOME=/root |
| 49 |
@@ -23,5 +24,4 @@ |
| 50 |
SendSIGHUP=yes |
| 51 |
|
| 52 |
[Install] |
| 53 |
-WantedBy=multi-user.target |
| 54 |
-WantedBy=sme-server.target |
| 55 |
+WantedBy=basic.target |
| 56 |
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 |
| 57 |
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/bootstrap-runlevel7.service 1969-12-31 19:00:00.000000000 -0500 |
| 58 |
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/bootstrap-runlevel7.service 2021-01-11 03:01:23.012000000 -0500 |
| 59 |
@@ -0,0 +1,27 @@ |
| 60 |
+[Unit] |
| 61 |
+Description=SME server bootstrap-runlevel7 to start old SME rc7.d services |
| 62 |
+DefaultDependencies=no |
| 63 |
+Conflicts=shutdown.target |
| 64 |
+After=livesys.service plymouth-quit-wait.service |
| 65 |
+After=systemd-vconsole-setup.service |
| 66 |
+After=basic.target bootstrap-console.service |
| 67 |
+Before=getty@tty1.service |
| 68 |
+Before=shutdown.target |
| 69 |
+ |
| 70 |
+[Service] |
| 71 |
+Environment=HOME=/root |
| 72 |
+WorkingDirectory=/root |
| 73 |
+ExecStartPre=-/bin/plymouth quit |
| 74 |
+ExecStart=/sbin/e-smith/bootstrap-runlevel7 |
| 75 |
+Type=oneshot |
| 76 |
+Restart=no |
| 77 |
+TimeoutSec=0 |
| 78 |
+StandardInput=tty |
| 79 |
+StandardOutput=tty |
| 80 |
+StandardError=tty |
| 81 |
+KillMode=process |
| 82 |
+IgnoreSIGPIPE=no |
| 83 |
+SendSIGHUP=yes |
| 84 |
+ |
| 85 |
+[Install] |
| 86 |
+WantedBy=sme-server.target |
| 87 |
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 |
| 88 |
--- 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 |
| 89 |
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/status 2021-01-11 03:49:10.495000000 -0500 |
| 90 |
@@ -0,0 +1 @@ |
| 91 |
+enabled |
| 92 |
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 |
| 93 |
--- 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 |
| 94 |
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/bootstrap-runlevel7/type 2021-01-11 03:49:02.843000000 -0500 |
| 95 |
@@ -0,0 +1 @@ |
| 96 |
+service |
| 97 |
diff -Nur e-smith-base-5.8.0.old/root/sbin/e-smith/bootstrap-runlevel7 e-smith-base-5.8.0/root/sbin/e-smith/bootstrap-runlevel7 |
| 98 |
--- e-smith-base-5.8.0.old/root/sbin/e-smith/bootstrap-runlevel7 1969-12-31 19:00:00.000000000 -0500 |
| 99 |
+++ e-smith-base-5.8.0/root/sbin/e-smith/bootstrap-runlevel7 2021-02-12 23:26:49.115000000 -0500 |
| 100 |
@@ -0,0 +1,43 @@ |
| 101 |
+#!/usr/bin/perl -wT |
| 102 |
+ |
| 103 |
+#---------------------------------------------------------------------- |
| 104 |
+# copyright (C) 1999-2006 Mitel Corporation |
| 105 |
+# |
| 106 |
+# This program is free software; you can redistribute it and/or modify |
| 107 |
+# it under the terms of the GNU General Public License as published by |
| 108 |
+# the Free Software Foundation; either version 2 of the License, or |
| 109 |
+# (at your option) any later version. |
| 110 |
+# |
| 111 |
+# This program is distributed in the hope that it will be useful, |
| 112 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 113 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 114 |
+# GNU General Public License for more details. |
| 115 |
+# |
| 116 |
+# You should have received a copy of the GNU General Public License |
| 117 |
+# along with this program; if not, write to the Free Software |
| 118 |
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 119 |
+#---------------------------------------------------------------------- |
| 120 |
+package esmith::console; |
| 121 |
+ |
| 122 |
+use strict; |
| 123 |
+ |
| 124 |
+use Locale::gettext; |
| 125 |
+use esmith::ConfigDB::unsaved; |
| 126 |
+use esmith::console; |
| 127 |
+ |
| 128 |
+my $console = esmith::console->new(); |
| 129 |
+ |
| 130 |
+my $db = esmith::ConfigDB::unsaved->open; |
| 131 |
+ |
| 132 |
+my $termType = $db->get_prop('serial-console', 'Terminal') || ''; |
| 133 |
+ |
| 134 |
+$ENV{TERM} = $termType if($termType); |
| 135 |
+ |
| 136 |
+$ARGV[0] = 'tty'; |
| 137 |
+$console = esmith::console->new(); |
| 138 |
+use esmith::console::startup; |
| 139 |
+esmith::console::startup->new->doit($console,$db); |
| 140 |
+ |
| 141 |
+system("/usr/bin/tput", "clear"); |
| 142 |
+exit (0); |
| 143 |
+ |
Parent Directory
| 
Revision Log
| 
Revision Graph
