X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=b6c27cfb3708e563159b558bd5c2dbe742f57f13;hb=HEAD;hp=a39035e9f3552727f9bec094a65b31e1a6bba253;hpb=4542b74154d50f1106a86691815b530593980803;p=xinetd-cn.git

diff --git a/debian/postinst b/debian/postinst
index a39035e..32a67f3 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,7 +5,7 @@ set -e
 [ "$1" = "configure" ] || exit 0
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
-# Load CARNet Tools
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 PKG=xinetd-cn
@@ -13,7 +13,7 @@ CONF=/etc/xinetd.conf
 INETDCONF=/etc/inetd.conf
 DEFAULT=/etc/default/xinetd
 BACKUPDIR=/var/backups/xinetd-cn
-XCONV_TOOL=/usr/sbin/xconv.pl
+XCONV_TOOL=/usr/bin/xconv.pl
 
 need_restart=0
 temp_files=
@@ -67,11 +67,15 @@ trap cleanup 0 1 2 15
 
 # First, we do backup (inetd, xinetd)
 #
-if cp_backup_conffile -r -d $BACKUPDIR -p $INETDCONF; then
-    cp_echo "CN: Old $INETDCONF saved as $BACKUPDIR/`basename $INETDCONF`.bak."
+if [ -f "$INETDCONF" ]; then
+    if cp_backup_conffile -r -d $BACKUPDIR -p $INETDCONF; then
+        cp_echo "CN: Old $INETDCONF saved as $BACKUPDIR/`basename $INETDCONF`.bak."
+    fi
 fi
-if cp_backup_conffile -r -d $BACKUPDIR -p $CONF; then
-    cp_echo "CN: Old $CONF saved as $BACKUPDIR/`basename $CONF`.bak."
+if [ -f "$CONF" ]; then
+    if cp_backup_conffile -r -d $BACKUPDIR -p $CONF; then
+        cp_echo "CN: Old $CONF saved as $BACKUPDIR/`basename $CONF`.bak."
+    fi
 fi
 
 CONFTMP=`mktemp $CONF.tmp.XXXXXX`
@@ -264,22 +268,13 @@ fi
 # Restart xinetd if needed
 #
 if [ $need_restart -eq 1 ]; then
-    if [ -x "/etc/init.d/xinetd" ]; then
-        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-            invoke-rc.d xinetd restart || exit $?
-        else
-            /etc/init.d/xinetd restart || exit $?
-        fi
-    fi
+    service xinetd restart || exit $?
 fi
 
 # Mail root
 #
 cp_mail "$PKG"
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0