summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2008-12-20 07:31:31 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:23 +0200
commitcebf8a235179f6eada27b0916001371d9b61ae1c (patch)
tree920a3dbe26c8fff6c047b633587ea0ed08797de5
parent46a243ddda735e68a8e6317132dbf16e9966e17d (diff)
downloadinetutils-cebf8a235179f6eada27b0916001371d9b61ae1c.tar.gz
Do not fail to start inetutils-inetd when there are services enabled
For example in files under /etc/inetd.d/. Closes: #500729
-rw-r--r--debian/changelog2
-rw-r--r--debian/inetutils-inetd.init2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0fa0aa4..f02bf2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ inetutils (2:1.5.dfsg.1-9) UNRELEASED; urgency=low
inetd, to not conflict with other inetd implementations. (Closes: #507121)
Thanks to Petter Reinholdtsen <petter.reinholdtsen@usit.uio.no>.
* Call 'set -e' in maintainer scripts to guarantee a correct exit status.
+ * Do not fail to start inetutils-inetd when there are services enabled in
+ files under /etc/inetd.d/. (Closes: #500729)
-- Guillem Jover <guillem@debian.org> Thu, 18 Dec 2008 07:51:43 +0200
diff --git a/debian/inetutils-inetd.init b/debian/inetutils-inetd.init
index 266aa5b..0d41bed 100644
--- a/debian/inetutils-inetd.init
+++ b/debian/inetutils-inetd.init
@@ -23,7 +23,7 @@ set -e
check_no_services()
{
- if ! grep -q "^[0-9A-Za-z/]" /etc/inetd.conf; then
+ if ! grep -q "^[0-9A-Za-z/]" /etc/inetd.conf /etc/inetd.d/* 2>/dev/null; then
log_warning_msg "Not starting internet superserver: no services enabled."
exit 0
fi