/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11119-local2systemd.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11119-local2systemd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (hide annotations) (download)
Wed Dec 9 16:53:58 2020 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-64_el7_sme
Changes since 1.1: +1 -1 lines
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-64.sme
- move local service to systemd [SME: ]
  make it run /etc/rc.d/rc.local
  cleaning /var/service/syslog still there

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 jpp 1.2 +Type=oneshot
49 jpp 1.1 +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

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed