[SCM] mediatomb/master: d/mediatomb-daemon.service: make configuration file mandatory.

zumbi at users.alioth.debian.org zumbi at users.alioth.debian.org
Thu Oct 16 13:19:29 UTC 2014


The following commit has been merged in the master branch:
commit 4bcfd8bbe4673a63e89592d708d6e66f2bb3f602
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Thu Oct 16 15:19:15 2014 +0200

    d/mediatomb-daemon.service: make configuration file mandatory.
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c62798e..c1fd98c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mediatomb (0.12.1-7) UNRELEASED; urgency=medium
 
   * d/mediatomb-daemon.mediatomb.init: issue an error if MT_USER is not set.
   * d/rules: disable libmp4v2.
+  * d/mediatomb-daemon.service: make configuration file mandatory.
 
  -- Hector Oron <zumbi at debian.org>  Thu, 16 Oct 2014 00:57:33 +0200
 
diff --git a/debian/mediatomb-daemon.service b/debian/mediatomb-daemon.service
index b61e237..4f17027 100644
--- a/debian/mediatomb-daemon.service
+++ b/debian/mediatomb-daemon.service
@@ -4,7 +4,7 @@ After=NetworkManager-wait-online.service network.target
 
 [Service]
 Type=forking
-EnvironmentFile=-/etc/default/mediatomb
+EnvironmentFile=/etc/default/mediatomb
 PIDFile=/run/mediatomb.pid
 ExecStartPre=-/sbin/route add -net 239.0.0.0 netmask 255.0.0.0 $MT_INTERFACE
 ExecStartPre=-/sbin/ifconfig $MT_INTERFACE allmulti

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list