[Pkg-ocaml-maint-commits] r3329 - in
/trunk/packages/mldonkey/trunk/debian: changelog
mldonkey-server.init mldonkey-server.install mldonkey-server.menu
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Tue Nov 7 15:37:04 CET 2006
Author: smimram
Date: Tue Nov 7 15:37:03 2006
New Revision: 3329
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3329
Log:
Cleaner init.d.
Modified:
trunk/packages/mldonkey/trunk/debian/changelog
trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
trunk/packages/mldonkey/trunk/debian/mldonkey-server.install
trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu
Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3329&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Tue Nov 7 15:37:03 2006
@@ -1,3 +1,11 @@
+mldonkey (2.8.1-3) UNRELEASED; urgency=low
+
+ * Using start-stop-daemon to fully handle daemon, closes: #394543.
+ * Not installing mldonkey-server anymore.
+ * Using -pid option of mlnet to create the pidfile, closes: #341615.
+
+ -- Samuel Mimram <smimram at debian.org> Tue, 7 Nov 2006 14:20:59 +0000
+
mldonkey (2.8.1-2) unstable; urgency=low
* Added newdns.dpatch to fix the DNS resolution problem with
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.init?rev=3329&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Tue Nov 7 15:37:03 2006
@@ -9,12 +9,12 @@
#
#
# This file has been rewritten by Sylvain Le Gall <sylvain.le-gall at m4x.org>
-# for mldonkey-package.
+# and Samuel Mimram <smimram at debian.org> for the mldonkey package.
#
### BEGIN INIT INFO
# Provides: mldonkey-server
-# Required-Start: $syslog $network
-# Required-Stop: $syslog $network
+# Required-Start: $network
+# Required-Stop: $network
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
@@ -24,11 +24,13 @@
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-WRAPPER=/usr/bin/mldonkey_server
NAME=mlnet
+EXEC=/usr/bin/$NAME
DESC="MLDonkey"
CONFIG=/etc/default/mldonkey-server
-PIDFILE=/var/run/mldonkey/$NAME.pid
+PIDDIR=/var/run/mldonkey
+PIDFILE=$PIDDIR/$NAME.pid
+LOGFILE=/var/log/mldonkey/$NAME.log
test -x $WRAPPER || exit 0
@@ -48,16 +50,13 @@
WRAPPER_OPTIONS=""
-# Set the pidfile
-WRAPPER_OPTIONS="$WRAPPER_OPTIONS --pidfile $PIDFILE"
-
# Set configuration value, from CONFIG
if [ -n "$MLDONKEY_DIR" ]; then
WRAPPER_OPTIONS="$WRAPPER_OPTIONS --chdir $MLDONKEY_DIR"
fi
if [ -n "$MLDONKEY_GROUP" ]; then
- WRAPPER_OPTIONS="$WRAPPER_OPTIONS --chgid $MLDONKEY_GROUP"
+ WRAPPER_OPTIONS="$WRAPPER_OPTIONS --group $MLDONKEY_GROUP"
fi
if [ -n "$MLDONKEY_UMASK" ]; then
@@ -65,11 +64,7 @@
fi
if [ -n "$MLDONKEY_NICENESS" ]; then
- WRAPPER_OPTIONS="$WRAPPER_OPTIONS --nice $MLDONKEY_NICENESS"
-fi
-
-if [ -n "$MAX_ALIVE" ]; then
- WRAPPER_OPTIONS="$WRAPPER_OPTIONS --max-alive $MAX_ALIVE"
+ WRAPPER_OPTIONS="$WRAPPER_OPTIONS --nicelevel $MLDONKEY_NICENESS"
fi
case "$1" in
@@ -95,12 +90,11 @@
fi
USER=`/usr/bin/stat --format="%U" "$MLDONKEY_DIR/downloads.ini"`
- WRAPPER_OPTIONS="$WRAPPER_OPTIONS --chuid $USER"
+ WRAPPER_OPTIONS="$WRAPPER_OPTIONS --user $USER"
- # export MLDONKEY_CHROOT=$MLDONKEY_DIR
-
- start-stop-daemon --start --pidfile $PIDFILE \
- --exec $WRAPPER -- --start --daemon $WRAPPER_OPTIONS
+ start-stop-daemon --start $WRAPPER_OPTIONS \
+ --pidfile $PIDFILE --background --exec $EXEC \
+ -- -pid $PIDDIR > $LOGFILE 2>&1
echo "."
;;
@@ -109,14 +103,8 @@
start-stop-daemon --stop --oknodo --pidfile $PIDFILE
echo "."
;;
- reload)
- echo -n "Reloading $DESC: $NAME"
- $WRAPPER --restart --quiet $WRAPPER_OPTIONS
- echo "."
- ;;
force-reload|restart)
$0 stop
- sleep 1
$0 start
;;
*)
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.install?rev=3329&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.install (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.install Tue Nov 7 15:37:03 2006
@@ -1,6 +1,5 @@
mlnet usr/bin/
debian/utils/mldonkey_options usr/bin/
-debian/utils/mldonkey_server usr/bin/
debian/utils/mldonkey_users usr/bin/
debian/utils/mldonkey_files usr/bin/
debian/utils/mldonkey_command usr/bin/
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu?rev=3329&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu Tue Nov 7 15:37:03 2006
@@ -1,10 +1,10 @@
?package(mldonkey-server):needs="text" section="Apps/Net"\
hints="P2P"\
title="MLDonkey Server (start)"\
- command="/usr/bin/mldonkey_server --start"\
+ command="/etc/init.d/mldonkey-server force-start"\
icon="/usr/share/pixmaps/mlnet.xpm"
?package(mldonkey-server):needs="text" section="Apps/Net"\
hints="P2P"\
title="MLDonkey Server (stop)"\
- command="/usr/bin/mldonkey_server --stop"\
+ command="/etc/init.d/mldonkey-server stop"\
icon="/usr/share/pixmaps/mlnet.xpm"
More information about the Pkg-ocaml-maint-commits
mailing list