From 686f285e949bfc8ab59cc724c183f35c90f1cc3e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Tue, 25 Feb 2025 23:25:06 -0500
Subject: [PATCH] * Tue Feb 25 2025 Jean-Philippe Pialasse <jpp@koozali.org>
 11.0.0-7.sme - move to full systemd unit [SME: 12877]

---
 root/var/service/tinydns/down     |  0
 root/var/service/tinydns/env/ROOT |  1 -
 root/var/service/tinydns/log/run  | 27 ---------------------------
 root/var/service/tinydns/run      |  8 --------
 smeserver-tinydns.spec            |  2 ++
 5 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 root/var/service/tinydns/down
 delete mode 100644 root/var/service/tinydns/env/ROOT
 delete mode 100644 root/var/service/tinydns/log/run
 delete mode 100644 root/var/service/tinydns/run

diff --git a/root/var/service/tinydns/down b/root/var/service/tinydns/down
deleted file mode 100644
index e69de29..0000000
diff --git a/root/var/service/tinydns/env/ROOT b/root/var/service/tinydns/env/ROOT
deleted file mode 100644
index 0393eeb..0000000
--- a/root/var/service/tinydns/env/ROOT
+++ /dev/null
@@ -1 +0,0 @@
-/var/service/tinydns/root
diff --git a/root/var/service/tinydns/log/run b/root/var/service/tinydns/log/run
deleted file mode 100644
index 553572c..0000000
--- a/root/var/service/tinydns/log/run
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-#----------------------------------------------------------------------
-# copyright (C) 1999-2003 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 		
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 		
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.mitel.com/sme/ for details.
-#----------------------------------------------------------------------
-
-exec 					\
-    /usr/bin/setuidgid dnslog 	\
-    /usr/bin/multilog t s5000000  \
-    /var/log/tinydns
diff --git a/root/var/service/tinydns/run b/root/var/service/tinydns/run
deleted file mode 100644
index 0a8c41d..0000000
--- a/root/var/service/tinydns/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-./control/1
-exec envdir ./env sh -c '
- exec envuidgid dns \
- softlimit -d "$DATALIMIT" \
- /usr/local/bin/tinydns
-'
diff --git a/smeserver-tinydns.spec b/smeserver-tinydns.spec
index 890950f..4745d67 100644
--- a/smeserver-tinydns.spec
+++ b/smeserver-tinydns.spec
@@ -447,7 +447,9 @@ if [ $1 -gt 1 ] ; then
   if [ -e /var/service/tinydns/run ] ; then
         /usr/bin/sv d tinydns
         /usr/bin/sv d tinydns/log
+  fi
 fi
+
 /sbin/e-smith/create-system-user dns 53 "Name server" /var/service/tinydns /bin/false
 /sbin/e-smith/create-system-user dnslog 411 "DNS log user" /var/log /bin/false
 exit 0