[SCM] Mumudvb packaging branch, upstream, updated. 24c2efb080b56abb8e7be67bae30ba7fe457759e

[Brice DUBOST]

The following commit has been merged in the upstream branch:
commit cc35de16a8c25c6723bb1f87929381d511bdade7
Author: Brice DUBOST <braice at braice.net>
Date:   Sat Nov 1 13:03:33 2008 +0100

    Init scripts update, small doc update

diff --git a/README b/README
index 49cbab2..6fa364c 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ Mailing list :
 
  * Stream channels from a transponder on different multicast IPs
  * The program can rewrite the PAT Pid in order to announce only present channels (useful for some set-top boxes)
- * Experimental support for scrambled channels
+ * Support for scrambled channels (beta) (if you don't have a CAM you can use sasc-ng)
  * Support for autoconfiguration, see further
  * Generation of SAP announces
 
@@ -57,7 +57,6 @@ Mailing list :
  * mumudvb automatically suscribe to all multicast groups (IGMP membership request) in order to avoid some switches to broadcast all channels.
  * The program can rewrite the PAT Pid in order to announce only present channels (useful for some set-top boxes)
   * Note : We don't rewrite Pat Pids larger than 188 bytes
- * Experimental support for scrambled channels
  * Support for autoconfiguration, see further
 
 
diff --git a/README-fr b/README-fr
index d9ae829..96b9f35 100644
--- a/README-fr
+++ b/README-fr
@@ -30,7 +30,7 @@ Mailing-liste :
 == Fonctonalités principales =
  * Possibilité de diffuser plusieurs chaînes d'un même transpondeur sur des ips différentes
  * Mumudvb est capable de réécrire à la volée le pid PAT pour n'annoncer que les flux réelement présents (utile pour les set-top boxes).
- * Support expérimental des chaines cryptées
+ * Support des chaines cryptées (si vous n'avez pas de CAM vous pouveÃÃz utiliser sasc-ng)
  * Mumudvb est capable de trouver les chaines présentent dans le flux
  * Génération automatique des annonces SAP
 
diff --git a/scripts/README b/scripts/README
index 1888db9..efb85dc 100644
--- a/scripts/README
+++ b/scripts/README
@@ -1,4 +1,4 @@
-Startup scripts for mumudvb
+Startup scripts for mumudvb (Debian flavour)
 
-This script expect to find /etc/mumudvb/mumudvb.conf, with the syntax specified in the example file
+This script expects to find /etc/default/mumudvb, with the syntax specified in the example file
 
diff --git a/scripts/mumudvb.conf b/scripts/mumudvb
similarity index 72%
rename from scripts/mumudvb.conf
rename to scripts/mumudvb
index 151855e..db17006 100644
--- a/scripts/mumudvb.conf
+++ b/scripts/mumudvb
@@ -3,6 +3,15 @@
 # This file is used to specify the locations of mumudvb config files for each card
 #
 
+#Don't start mumudvb
+#DONTSTARTMUMU=1
+
+#Options for mumudvb
+DAEMON_OPTS=""
+
+#The user to launch mumudvb
+DAEMONUSER=mumudvb
+
 #Change this line to reflect your configuration
 #Ex : ADAPTERS="0 1 2 4"
 ADAPTERS="0"
diff --git a/scripts/mumudvb.init b/scripts/mumudvb.init
index 527f883..884c73e 100644
--- a/scripts/mumudvb.init
+++ b/scripts/mumudvb.init
@@ -11,16 +11,15 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/mumudvb
-DAEMON_OPTS=" -c "
 PIDDIR=/var/run/mumudvb
 NAME=Mumudvb
-DAEMONUSER=root
 
 #Reading of the config file
-if [ -f /etc/mumudvb/mumudvb.conf ] ; then
-        . /etc/mumudvb/mumudvb.conf
+if [ -f /etc/default/mumudvb ] ; then
+        . /etc/default/mumudvb
 fi
 
+if [ $DONTSTARTMUMU = true ]; then exit 0; fi
 
 . /lib/lsb/init-functions
 
@@ -42,7 +41,7 @@ do_start() {
                    log_warning_msg "\t\tConfig file $CONFIG_FILE not found."
 		else
 		   start-stop-daemon --start --oknodo --pidfile "$PIDDIR/mumudvb_carte$PIDFILE.pid" \
-               		 --exec $DAEMON -- $DAEMON_OPTS $CONFIG_FILE
+               		 --exec $DAEMON -- $DAEMON_OPTS -c $CONFIG_FILE
 		fi
 	done
 }

-- 
Mumudvb packaging