From 698196044dfee2b84fcc8c92cc92d89d0ddd5e45 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Tue, 28 Oct 2014 13:31:53 +0000
Subject: Deal with xinetd.d services properly (e.g. sane mga#14397)

---
 del-service | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'del-service')

diff --git a/del-service b/del-service
index 388add9..55c26bf 100755
--- a/del-service
+++ b/del-service
@@ -87,15 +87,17 @@ if [ $num = 0 ]; then
 
     if [ -z "$DURING_INSTALL" ]; then
         if [ x$init = xsystemd ]; then
-            /bin/systemctl stop $units
+            /bin/systemctl stop $units >/dev/null 2>&1
         elif [ -n "srv" ]; then
             /sbin/service $srv stop > /dev/null || :
         fi
     fi
 
     /bin/systemctl --no-reload --quiet disable $units >/dev/null 2>&1
-    if [ -n "$srv" -a -f /etc/rc.d/init.d/$srv ]; then
-        /sbin/chkconfig --del $srv
+    if [ -n "$srv" ]; then
+        if [ -f /etc/rc.d/init.d/$srv -o -f /etc/xinetd.d/$srv ]; then
+            /sbin/chkconfig --del $srv
+        fi
     fi
 fi
 
-- 
cgit v1.2.1