[mediatomb] Fix hardcoding in unit file.

Jon Ciesla limb at fedoraproject.org
Tue Oct 30 14:24:43 UTC 2012


commit c2eca2d7202f3b239e264897bf4756d2fff2c025
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Oct 30 09:23:06 2012 -0500

    Fix hardcoding in unit file.

 mediatomb.service |    7 ++++---
 mediatomb.spec    |    5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/mediatomb.service b/mediatomb.service
index d8ae5ee..4c62ef4 100644
--- a/mediatomb.service
+++ b/mediatomb.service
@@ -4,10 +4,11 @@ After=network.target
 
 [Service]
 Type=forking
+EnvironmentFile=-/etc/mediatomb.conf
 PIDFile=/run/mediatomb.pid
-ExecStartPre=-/usr/sbin/route add -net 239.0.0.0 netmask 255.0.0.0 eth0
-ExecStartPre=-/usr/sbin/ifconfig eth0 allmulti
-ExecStart=/usr/bin/mediatomb -d -u mediatomb -g mediatomb -P /run/mediatomb.pid -l /var/log/mediatomb -m /etc -f mediatomb -p 50500 -e eth0 
+ExecStartPre=-/usr/sbin/route add -net 239.0.0.0 netmask 255.0.0.0 $MT_INTERFACE
+ExecStartPre=-/usr/sbin/ifconfig $MT_INTERFACE allmulti
+ExecStart=/usr/bin/mediatomb -d -u $MT_USER -g $MT_USER -P /run/mediatomb.pid -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR -p $MT_PORT -e $MT_INTERFACE 
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mediatomb.spec b/mediatomb.spec
index abe5739..322ed47 100644
--- a/mediatomb.spec
+++ b/mediatomb.spec
@@ -13,7 +13,7 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -210,6 +210,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 30 2012 Jon Ciesla <limburgher at gmail.com> - 0.12.1-20
+- Fix most hardcoding in unit file.
+
 * Sun Sep 16 2012 David Jaša <jasa.david at gmail.com> - 0.12.1-19
 - added patch to enable subtitles support
 - Committed by Jon Ciesla <limburgher at gmail.com>


More information about the scm-commits mailing list