e-smith-base/sme10/e-smith-base-5.8.0-bz11119-local2systemd.patch

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=forking
+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
1	jpp	1.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 2020-12-09 11:03:25.563000000 -0500
3			+++ e-smith-base-5.8.0/createlinks 2020-12-09 11:41:07.555000000 -0500
4			@@ -607,34 +607,11 @@
5			$event = "email-update";
6
7
8			-my %service2order =
9			-(
10			- # Start rsyslog up before network!
11			- 'local' => "99",
12			-);
13			-
14			-foreach my $service (keys %service2order)
15			-{
16			- service_link_enhanced($service, $service2order{$service}, 7);
17			-}
18			-
19			-
20			-foreach my $service (keys %service2order)
21			-{
22			- service_link_enhanced($service, $service2order{$service}, 0);
23			- service_link_enhanced($service, $service2order{$service}, 6);
24			- service_link_enhanced($service, $service2order{$service}, 1);
25			-}
26			-
27			# Set up links to daemontools.
28
29			safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPHostname");
30			safe_symlink("run.dhclient", "root/var/service/wan/run.DHCPEthernetAddress");
31
32			-# Local event
33			-safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/local");
34			-safe_symlink("/var/service/local" , 'root/service/local');
35			-safe_touch("root/var/service/local/down");
36
37			# no template headers for /etc/pam_ldap.secret
38			safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin");
39			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
40			--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service 1969-12-31 19:00:00.000000000 -0500
41			+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service 2020-12-09 11:19:00.868000000 -0500
42			@@ -0,0 +1,14 @@
43			+[Unit]
44			+Description=Local service for Koozali SME Server
45			+After=network-pre.target networking.service
46			+
47			+[Service]
48			+Type=forking
49			+ExecStartPre=/sbin/e-smith/service-status local
50			+ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local
51			+ExecStart=/sbin/e-smith/signal-event local
52			+ExecStart=/usr/bin/systemctl restart rc-local.service
53			+RemainAfterExit=yes
54			+
55			+[Install]
56			+WantedBy=sme-server.target