diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2010-01-25 16:27:26 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2010-01-25 16:27:26 +0000 |
| commit | d2c6ed78522a80ecfda081f00741c2437d2563f6 (patch) | |
| tree | d34c0217775fc3c4f5f1412e0283ea9e31bb90cf /media-sound/mt-daapd | |
| parent | Version bump KDE 4.3.5 (diff) | |
| download | gentoo-2-d2c6ed78522a80ecfda081f00741c2437d2563f6.tar.gz gentoo-2-d2c6ed78522a80ecfda081f00741c2437d2563f6.tar.bz2 gentoo-2-d2c6ed78522a80ecfda081f00741c2437d2563f6.zip | |
Fixing init script for #230917
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/mt-daapd')
| -rw-r--r-- | media-sound/mt-daapd/ChangeLog | 5 | ||||
| -rwxr-xr-x | media-sound/mt-daapd/files/mt-daapd.init.2 | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog index c50a2cde8a30..0a3caa7e8ef6 100644 --- a/media-sound/mt-daapd/ChangeLog +++ b/media-sound/mt-daapd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/mt-daapd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.66 2010/01/07 14:39:07 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.67 2010/01/25 16:27:24 patrick Exp $ + + 25 Jan 2010; Patrick Lauer <patrick@gentoo.org> files/mt-daapd.init.2: + Fixing init script for #230917 07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> mt-daapd-0.2.4.2.ebuild: diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2 index 797522aca9d1..6c3b44316cfa 100755 --- a/media-sound/mt-daapd/files/mt-daapd.init.2 +++ b/media-sound/mt-daapd/files/mt-daapd.init.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.3 2009/05/11 20:38:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.4 2010/01/25 16:27:26 patrick Exp $ # Somehow based on init.d file shipped with mt-daapd itself. # # You can run multiple copies of this service just symlinking them to @@ -11,6 +11,11 @@ # # The main instance (with no <name>) uses /etc/mt-daapd.conf +# Check for OpenRC/Baselayout 2 -- see bug #230917 +if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then + myservice=$RC_SVCNAME +fi + CONF="${myservice##*.}" if [[ -n ${CONF} && ${myservice} != "mt-daapd" ]]; then PIDFILE="/var/run/mt-daapd.${CONF}.pid" |