[SCM] mediatomb/master: d/mediatomb-daemon.service: require MT_USER for systemd unit file.

zumbi at users.alioth.debian.org zumbi at users.alioth.debian.org
Sun Oct 19 02:17:42 UTC 2014


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

    d/mediatomb-daemon.service: require MT_USER for systemd unit file.
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c1fd98c..6277a5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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.
+  * d/mediatomb-daemon.service: require MT_USER variable in configuration file.
 
  -- 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 4f17027..520e507 100644
--- a/debian/mediatomb-daemon.service
+++ b/debian/mediatomb-daemon.service
@@ -6,6 +6,7 @@ After=NetworkManager-wait-online.service network.target
 Type=forking
 EnvironmentFile=/etc/default/mediatomb
 PIDFile=/run/mediatomb.pid
+ExecStartPre=/bin/grep -q MT_USER /etc/default/mediatomb
 ExecStartPre=-/sbin/route add -net 239.0.0.0 netmask 255.0.0.0 $MT_INTERFACE
 ExecStartPre=-/sbin/ifconfig $MT_INTERFACE allmulti
 ExecStart=/usr/bin/mediatomb -d -u $MT_USER -g $MT_GROUP -P /run/mediatomb.pid -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR -p $MT_PORT -e $MT_INTERFACE 

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list