Add helper comment to confd file for bug 274627, comment #4 by Andrew Frink. Old cruft cleanup

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 1 insertions, 54 deletions

diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.confd b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
index f531ec70dc82..7f5c00830251 100644
--- a/net-misc/mediatomb/files/mediatomb-0.12.0.confd
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
@@ -24,4 +24,5 @@ MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
 MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
 
 # Other options you want to pass to MediaTomb.
+# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
 MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb.confd b/net-misc/mediatomb/files/mediatomb.confd
deleted file mode 100644
index 22fc21bd55cb..000000000000
--- a/net-misc/mediatomb/files/mediatomb.confd
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
-
-# See the mediatomb(1) manpage for more info.
-
-# MediaTomb Web UI port.
-# NOTE: The minimum value allowed is 49152
-MEDIATOMB_PORT=49152
-
-# Bind MediaTomb to this interface
-MEDIATOMB_INTERFACE="eth0"
-
-# Run MediaTomb as this user.
-# NOTE: It is not recommended to run MediaTomb as root for
-#       security reasons.
-MEDIATOMB_USER="mediatomb"
-
-# Run MediaTomb as this group.
-# NOTE: It is not recommended to run MediaTomb as root for
-#       security reasons.
-MEDIATOMB_GROUP="mediatomb"
-
-# Path to MediaTomb config file.
-MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
-
-# Path to MediaTomb log file.
-MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
-
-# Path to MediaTomb pid file.
-MEDIATOMB_PIDFILE="/var/run/mediatomb/mediatomb.pid"
-
-# Other options you want to pass to MediaTomb.
-MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb.initd b/net-misc/mediatomb/files/mediatomb.initd
deleted file mode 100644
index 12f96a4a5669..000000000000
--- a/net-misc/mediatomb/files/mediatomb.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net #MYSQL#
-}
-
-start() {
-	ebegin "Starting MediaTomb"
-	start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
-		--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
-		--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
-		--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
-		--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
-		--interface ${MEDIATOMB_INTERFACE} ${MEDIATOMB_OPTIONS}
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping MediaTomb"
-	start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
-	eend $?
-}