3 files changed, 52 insertions, 2 deletions
diff --git a/media-sound/squeezeboxserver/files/build-modules-7.5.1-r1.sh b/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
index a0c0a12b9d49..6da66cdf4cf0 100644..100755
--- a/media-sound/squeezeboxserver/files/build-modules-7.5.1-r1.sh
+++ b/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Id: build-modules-7.5.1-r1.sh,v 1.1 2010/09/19 14:47:03 lavajoe Exp $
+# $Id: build-modules-7.5.1.sh,v 1.3 2011/06/05 16:06:47 lavajoe Exp $
 #
 # This script builds all binary Perl modules required by Squeezebox Server.
 
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
index b95ff07f94db..e7068c8e2f94 100755
--- a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.5 2011/05/14 15:26:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.6 2011/06/05 16:06:47 lavajoe Exp $
 
 # These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezeboxserver.
@@ -25,6 +25,7 @@ start() {
 	cd /
 	start-stop-daemon \
 		--start --exec /usr/sbin/${scname} \
+		--pidfile ${pidfile} \
 		--chuid ${scuser} \
 		--background \
 		-- \
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1 b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1
new file mode 100755
index 000000000000..af30a6466ee1
--- /dev/null
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d.baselayout1,v 1.1 2011/06/05 16:06:47 lavajoe Exp $
+
+# These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
+# user-servicable parts go in /etc/conf.d/squeezeboxserver.
+pidfile=/var/run/squeezeboxserver/squeezeboxserver.pid
+logdir=/var/log/squeezeboxserver
+varlibdir=/var/lib/squeezeboxserver
+cachedir=${varlibdir}/cache
+prefsdir=/etc/squeezeboxserver/prefs
+prefsfile=/etc/squeezeboxserver/squeezeboxserver.prefs
+scuser=squeezeboxserver
+scname=squeezeboxserver
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	ebegin "Starting Squeezebox Server"
+
+	cd /
+	start-stop-daemon \
+		--start --exec /usr/bin/perl /usr/sbin/${scname} \
+		--pidfile ${pidfile} \
+		--startas /usr/sbin/${scname} \
+		--chuid ${scuser} \
+		-- \
+		--quiet --daemon \
+		--pidfile=${pidfile} \
+		--cachedir=${cachedir} \
+		--prefsfile=${prefsfile} \
+		--prefsdir=${prefsdir} \
+		--logdir=${logdir} \
+		--audiodir=${SBS_MUSIC_DIR} \
+		--playlistdir=${SBS_PLAYLISTS_DIR} \
+		${SBS_OPTS}
+
+	eend $? "Failed to start Squeezebox Server"
+}
+
+stop() {
+	ebegin "Stopping Squeezebox Server"
+	start-stop-daemon --oknodo --retry 10 --stop --pidfile ${pidfile}
+	eend $? "Failed to stop Squeezebox Server"
+}