diff -Nur e-smith-oidentd-2.6.0.old/createlinks e-smith-oidentd-2.6.0/createlinks --- e-smith-oidentd-2.6.0.old/createlinks 2006-03-15 14:59:23.000000000 -0500 +++ e-smith-oidentd-2.6.0/createlinks 2020-11-11 17:29:50.479000000 -0500 @@ -2,9 +2,37 @@ use esmith::Build::CreateLinks qw(:all); -safe_symlink("/etc/rc.d/init.d/daemontools", - "root/etc/rc.d/init.d/supervise/oidentd"); templates2events("/etc/oidentd_masq.conf", qw( console-save - bootstrap-console-save)); + bootstrap-console-save + e-smith-oidentd-update)); + +templates2events("/etc/sysconfig/oidentd", qw( + console-save + bootstrap-console-save + post-install + post-upgrade + e-smith-oidentd-update)); + +#service restart +my $event = "e-smith-oidentd-update"; +##will restart only if already running +#safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/oidentd"); + +event_link("systemd-default", $event, "05"); +event_link("systemd-reload", $event, "94"); + +#systemd link +foreach my $target (qw(multi-user sme-server)) +{ + foreach my $unit (qw( + oidentd + )) + { +#default is disabled +# 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: $!"; + } +} 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 --- e-smith-oidentd-2.6.0.old/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 1969-12-31 19:00:00.000000000 -0500 +++ e-smith-oidentd-2.6.0/root/etc/e-smith/templates/etc/sysconfig/oidentd/50options 2020-11-11 16:53:31.212000000 -0500 @@ -0,0 +1 @@ +OIDENTD_OPTIONS="-m -t 10 -q -u daemon -g daemon" 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 --- 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 +++ e-smith-oidentd-2.6.0/root/usr/lib/systemd/system/oidentd.service.d/50koozali.conf 2020-11-11 17:00:02.752000000 -0500 @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=/sbin/e-smith/service-status oidentd + 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 --- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/log/run 2006-03-15 14:59:23.000000000 -0500 +++ e-smith-oidentd-2.6.0/root/var/service/oidentd/log/run 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -#!/bin/sh -exec setuidgid smelog multilog t /var/log/oidentd 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 --- e-smith-oidentd-2.6.0.old/root/var/service/oidentd/run 2006-03-15 14:59:23.000000000 -0500 +++ e-smith-oidentd-2.6.0/root/var/service/oidentd/run 1969-12-31 19:00:00.000000000 -0500 @@ -1,3 +0,0 @@ -#! /bin/sh -exec 2>&1 -exec oidentd -m -i -S -t 10 -u daemon -g daemon