[Pkg-ocaml-maint-commits] r2934 - in /trunk/packages/mldonkey/trunk/debian: changelog mldonkey-server.init mldonkey-server.postinst

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Jul 13 13:34:05 2006
New Revision: 2934

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2934
Log:
Handle systems where where /var/run is cleaned on reboot.

Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2934&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Thu Jul 13 13:34:05 2006
@@ -1,3 +1,14 @@
+mldonkey (2.7.7-4) unstable; urgency=low
+
+  * Import patch from Ubuntu (thanks Reinhard Tartler) to handle systems where
+    /var/run is cleaned on reboot, closes: #354701.
+    - Introduce new config variable in /etc/default/mldonkey-server:
+      MLDONKEY_USER. This variable is only used by the init script.
+    - Mke the initscript create /var/run/mldonkey-server, setting correct
+      owner and permissions.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 13 Jul 2006 12:49:45 +0000
+
 mldonkey (2.7.7-3) unstable; urgency=low
 
   * Added 03_lock_config_files_space.dpatch in order to handle leftover

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=2934&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Thu Jul 13 13:34:05 2006
@@ -25,6 +25,17 @@
 set -e
 
 . $CONFIG
+
+if [ x"$MLDONKEY_USER" = x -o x"$MLDONKEY_GROUP" = x ]; then
+	echo Please set both variables "MLDONKEY_USER" and "MLDONKEY_GROUP" in /etc/default/mldonkey-server
+	exit 1
+fi
+
+# /var/run is on tempfs now!
+if [ ! -d /var/run/mldonkey ]; then
+	mkdir -m 755 /var/run/mldonkey
+fi
+chown $MLDONKEY_USER:$MLDONKEY_GROUP /var/run/mldonkey
 
 WRAPPER_OPTIONS=""
 

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst?rev=2934&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst Thu Jul 13 13:34:05 2006
@@ -211,7 +211,7 @@
         fi
       fi
       
-      if [  -n "$password" ]; then
+      if [ -n "$password" ]; then
         if [ -e "$new_mldonkey_dir/users.ini" ]; then
           $DEBUG && echo -n "Creating backup of $new_mldonkey_dir/users.ini: "
           /bin/cp -p -f "$new_mldonkey_dir/users.ini" "$new_mldonkey_dir/users.ini.dpkg"
@@ -289,6 +289,7 @@
 # This file is managed using ucf(1)
 
 MLDONKEY_DIR=$new_mldonkey_dir
+MLDONKEY_USER=$run_as_user
 MLDONKEY_GROUP=$mldonkey_group
 MLDONKEY_UMASK=$mldonkey_umask
 MAX_ALIVE=$max_alive