/[smeserver]/rpms/e-smith-oidentd/sme10/e-smith-oidentd-2.6.0-bz11095-systemd.patch
ViewVC logotype

Contents of /rpms/e-smith-oidentd/sme10/e-smith-oidentd-2.6.0-bz11095-systemd.patch

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


Revision 1.1 - (show annotations) (download)
Wed Nov 11 22:26:41 2020 UTC (3 years, 11 months ago) by jpp
Branch: MAIN
* Wed Nov 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
- adapt for systemd [SME: 11095]
- add event to avoid reboot on update [SME: 11135]

1 diff -Nur e-smith-oidentd-2.6.0.old/createlinks e-smith-oidentd-2.6.0/createlinks
2 --- e-smith-oidentd-2.6.0.old/createlinks 2006-03-15 14:59:23.000000000 -0500
3 +++ e-smith-oidentd-2.6.0/createlinks 2020-11-11 17:15:21.429000000 -0500
4 @@ -2,9 +2,35 @@
5
6 use esmith::Build::CreateLinks qw(:all);
7
8 -safe_symlink("/etc/rc.d/init.d/daemontools",
9 - "root/etc/rc.d/init.d/supervise/oidentd");
10
11 templates2events("/etc/oidentd_masq.conf", qw(
12 console-save
13 - bootstrap-console-save));
14 + bootstrap-console-save
15 + e-smith-oidentd-update));
16 +
17 +templates2events("/etc/sysconfig/oidentd", qw(
18 + console-save
19 + bootstrap-console-save
20 + post-install
21 + post-upgrade
22 + e-smith-oidentd-update));
23 +
24 +#service restart
25 +#my $service = "e-smith-oidentd-update";
26 +##will restart only if already running
27 +#safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/oidentd");
28 +
29 +#systemd link
30 +foreach my $target (qw(multi-user sme-server))
31 +{
32 + foreach my $unit (qw(
33 + oidentd
34 + ))
35 + {
36 +#default is disabled
37 +# symlink("../$unit",
38 +# "root/usr/lib/systemd/system/$target.target.wants/$unit")
39 +# or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!";
40 + }
41 +}
42 +
43 diff -Nur e-smith-oidentd-2.6.0.old/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options e-smith-oidentd-2.6.0/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options
44 --- e-smith-oidentd-2.6.0.old/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 1969-12-31 19:00:00.000000000 -0500
45 +++ e-smith-oidentd-2.6.0/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 2020-11-11 16:53:31.212000000 -0500
46 @@ -0,0 +1 @@
47 +OIDENTD_OPTIONS="-m -t 10 -q -u daemon -g daemon"
48 diff -Nur e-smith-oidentd-2.6.0.old/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf e-smith-oidentd-2.6.0/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf
49 --- e-smith-oidentd-2.6.0.old/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500
50 +++ e-smith-oidentd-2.6.0/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf 2020-11-11 17:00:02.752000000 -0500
51 @@ -0,0 +1,3 @@
52 +[Service]
53 +ExecStartPre=/sbin/e-smith/service-status oidentd
54 +
55 diff -Nur e-smith-oidentd-2.6.0.old/root/var/service/oidentd/log/run e-smith-oidentd-2.6.0/root/var/service/oidentd/log/run
56 --- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/log/run 2006-03-15 14:59:23.000000000 -0500
57 +++ e-smith-oidentd-2.6.0/root/var/service/oidentd/log/run 1969-12-31 19:00:00.000000000 -0500
58 @@ -1,2 +0,0 @@
59 -#!/bin/sh
60 -exec setuidgid smelog multilog t /var/log/oidentd
61 diff -Nur e-smith-oidentd-2.6.0.old/root/var/service/oidentd/run e-smith-oidentd-2.6.0/root/var/service/oidentd/run
62 --- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/run 2006-03-15 14:59:23.000000000 -0500
63 +++ e-smith-oidentd-2.6.0/root/var/service/oidentd/run 1969-12-31 19:00:00.000000000 -0500
64 @@ -1,3 +0,0 @@
65 -#! /bin/sh
66 -exec 2>&1
67 -exec oidentd -m -i -S -t 10 -u daemon -g daemon

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