From: morlix <morlix@morlix.de>
Date: Thu, 27 Jun 2013 08:51:55 +0000 (+0200)
Subject: update for xinetd support
X-Git-Tag: v2.13-core74~20^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abb6ed9179489ab3ab5ba30662bd7b6ed9483f53;p=ipfire-2.x.git

update for xinetd support

Fix typo in xinetd configuration directory.
Restart xinetd during installation or uninstallation if
xinetd is installed.
---

diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 2b9566a61c..1d68f74d61 100644
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,3 +1,3 @@
 usr/bin/check_mk_agent
-etc/xinet.d/check_mk_agent
+etc/xinetd.d/check_mk_agent
 usr/bin/waitmax
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index 0a6cd1d535..6e6d557d2c 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -78,7 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && tar xzf agents.tar.gz
 	cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
-	cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinet.d/check_mk_agent
+	-mkdir /etc/xinetd.d
+	cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
 	cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
 	cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
 	@rm -rf $(DIR_APP)
diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 682363b5c7..e3fd4cb0b4 100644
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -24,3 +24,11 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+   if [[ -x /etc/init.d/xinetd ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
index 66f4344eb1..3a0860afeb 100644
--- a/src/paks/check_mk_agent/uninstall.sh
+++ b/src/paks/check_mk_agent/uninstall.sh
@@ -24,3 +24,11 @@
 . /opt/pakfire/lib/functions.sh
 make_backup ${NAME}
 remove_files
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+   if [[ -x /etc/init.d/xinetd ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi