From 66f439f5c705ed61c76f7839cec305674661b7e8 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Wed, 23 Mar 2011 01:57:09 +0000
Subject: [PATCH] =?utf8?q?Compl=C3=A9t=C3=A9=20transition=20inetd=20->=20x?=
 =?utf8?q?inetd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 stage5/pkg/samba         | 15 +++++++++++++--
 stage5/pkg/sane-backends | 16 +++++++++++++---
 stage5/pkg/tftp-hpa      | 16 ++++++++++++++--
 stage5/pkg/uw-imap       | 16 +++++++++++++---
 4 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/stage5/pkg/samba b/stage5/pkg/samba
index a37bce8..2fbc784 100644
--- a/stage5/pkg/samba
+++ b/stage5/pkg/samba
@@ -37,8 +37,19 @@ hvbuild_post()
     # Configuring SWAT
     string_add "swat            901/tcp" /etc/services
     string_add "swat_tunnel     902/tcp" /etc/services
-    string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
-        /etc/inetd.conf
+
+    cat > /etc/xinetd.d/swat << "EOF"
+service swat
+{
+   disable        = no
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/sbin/swat
+   log_type       = SYSLOG local4 info
+}
+EOF
 
     # Bootscript
     install -v -m740 ${SCRDIR}/bootscripts/samba /etc/rc.d/init.d
diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends
index b12df7c..695a11d 100644
--- a/stage5/pkg/sane-backends
+++ b/stage5/pkg/sane-backends
@@ -43,9 +43,19 @@ hvbuild_post()
         # Creating '/etc/sane.d/saned.conf'
         echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf
     
-        # Addition to /etc/inetd.conf
-        string_add "sane  stream tcp nowait saned /usr/sbin/tcpd saned" \
-	    /etc/inetd.conf
+        # Addition to xinetd
+        cat > /etc/xinetd.d/saned << "EOF"
+service sane
+{
+   disable        = no
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = saned
+   server         = /usr/sbin/saned
+   log_type       = SYSLOG local4 info
+}
+EOF
     else
         # If 'SANE_SERVER' is defined, then we must specify the address of the
         # remote SANE server to use.
diff --git a/stage5/pkg/tftp-hpa b/stage5/pkg/tftp-hpa
index 14a4f15..5e31df3 100644
--- a/stage5/pkg/tftp-hpa
+++ b/stage5/pkg/tftp-hpa
@@ -13,6 +13,18 @@ hvbuild_post()
 {
     mkdir -v -p /srv/tftpboot
 
-    # Addition to /etc/inetd.conf
-    string_add "tftp  dgram  udp wait       root  /usr/sbin/in.tftpd in.tftpd -s /srv/tftpboot -v -v -v -v -v" /etc/inetd.conf
+    # Addition to xinetd
+    cat > /etc/xinetd.d/tftp << "EOF"
+service tftp
+{
+   disable        = no
+   socket_type    = dgram
+   protocol       = udp
+   wait           = yes
+   user           = root
+   server         = /usr/sbin/in.tftpd
+   server_args    = -s /srv/tftpboot -v -v -v -v -v
+   log_type       = SYSLOG local4 info
+}
+EOF
 }
diff --git a/stage5/pkg/uw-imap b/stage5/pkg/uw-imap
index 8f10d49..326f9cb 100644
--- a/stage5/pkg/uw-imap
+++ b/stage5/pkg/uw-imap
@@ -28,9 +28,19 @@ hvbuild()
     install -m 644 c-client/*.h /usr/lib/uw-imap/include
     install -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include
 
-    # Addition to /etc/inetd.conf
-    string_add "imaps stream tcp nowait.400 root /usr/bin/imapd imapd" \
-        /etc/inetd.conf
+    # Addition to xinetd
+    cat > /etc/xinetd.d/imapd << "EOF"
+service imap
+{
+   disable        = no
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/bin/imapd
+   log_type       = SYSLOG local4 info
+}
+EOF
 
     # Addition to /etc/services
     string_add "imaps     993/tcp " /etc/services
-- 
2.20.1