summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2011-02-02 05:44:44 +0100
committerGuillem Jover <guillem@hadrons.org>2011-10-30 07:38:25 +0100
commit9368545f0520beaf23fc14cda8409f53c215f246 (patch)
tree782525d33e8b7be4e80783ba580642f36d3aaf5a
parent5dc1d4ceb1c8c1e59facada91d63ba930f6c6f61 (diff)
downloadinetutils-9368545f0520beaf23fc14cda8409f53c215f246.tar.gz
Add new inetutils-inetd default configuration file for the init script
This allows to pass INETD_OPTS to it on start. Closes: #606954
-rw-r--r--debian/changelog7
-rw-r--r--debian/inetutils-inetd.default5
-rw-r--r--debian/inetutils-inetd.init7
3 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 305311c..9a50343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+inetutils (2:1.8-4) UNRELEASED; urgency=low
+
+ * Add new inetutils-inetd default configuration file for the init script,
+ allowing to pass INETD_OPTS to it on start. (Closes: #606954)
+
+ -- Guillem Jover <guillem@debian.org> Wed, 02 Feb 2011 05:43:10 +0100
+
inetutils (2:1.8-3) unstable; urgency=low
* Revert wrong hunk from the tcpmux services fix.
diff --git a/debian/inetutils-inetd.default b/debian/inetutils-inetd.default
new file mode 100644
index 0000000..ddde544
--- /dev/null
+++ b/debian/inetutils-inetd.default
@@ -0,0 +1,5 @@
+#
+# inetutils inetd defaults
+#
+
+INETD_OPTS=
diff --git a/debian/inetutils-inetd.init b/debian/inetutils-inetd.init
index 8858076..fd6185b 100644
--- a/debian/inetutils-inetd.init
+++ b/debian/inetutils-inetd.init
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/inetutils-inetd
NAME=inetd
DESC="internet superserver"
+CONFIGFILE=/etc/default/inetutils-inetd
PIDFILE=/var/run/$NAME.pid
test -x $DAEMON || exit 0
@@ -22,6 +23,8 @@ set -e
. /lib/lsb/init-functions
+test -r $CONFIGFILE && . $CONFIGFILE
+
check_no_services()
{
if ! grep -q "^[0-9A-Za-z/]" /etc/inetd.conf /etc/inetd.d/* 2>/dev/null; then
@@ -36,7 +39,7 @@ case "$1" in
check_no_services
log_daemon_msg "Starting $DESC" "$NAME"
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- $INETD_OPTS
log_end_msg $?
;;
stop)
@@ -58,7 +61,7 @@ case "$1" in
check_no_services
sleep 1
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- $INETD_OPTS
log_end_msg $?
;;
status)