Fix init script for 2.0.1 (bug 271882), thanks to Tim O'Kelly

Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

4 files changed, 41 insertions, 2 deletions

diff --git a/media-sound/audio-entropyd/files/audio-entropyd.conf b/media-sound/audio-entropyd/files/audio-entropyd.conf-1
index 8b5936a64625..75bdbcbe4756 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.conf
+++ b/media-sound/audio-entropyd/files/audio-entropyd.conf-1
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf,v 1.2 2004/08/14 13:37:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf-1,v 1.1 2009/11/12 09:54:21 angelos Exp $
 
 # /etc/conf.d/audio-entropyd
 
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.conf-2 b/media-sound/audio-entropyd/files/audio-entropyd.conf-2
new file mode 100644
index 000000000000..76a474874fc9
--- /dev/null
+++ b/media-sound/audio-entropyd/files/audio-entropyd.conf-2
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.conf-2,v 1.1 2009/11/12 09:54:21 angelos Exp $
+
+# /etc/conf.d/audio-entropyd
+
+# The acceptable values are DEVICE, READSIZE and SAMPLERATE
+# These defaults give the optimum entropy 
+
+#DEVICE="hw:0"
+
+#SAMPLERATE must be a valid sampling rate of your audio source
+SAMPLERATE="44050"
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.init b/media-sound/audio-entropyd/files/audio-entropyd.init-1
index 63d7009750fc..9f58d3474269 100644
--- a/media-sound/audio-entropyd/files/audio-entropyd.init
+++ b/media-sound/audio-entropyd/files/audio-entropyd.init-1
@@ -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/audio-entropyd/files/audio-entropyd.init,v 1.5 2007/06/24 20:57:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/files/audio-entropyd.init-1,v 1.1 2009/11/12 09:54:21 angelos Exp $
 
 depend() {
 	need modules
diff --git a/media-sound/audio-entropyd/files/audio-entropyd.init-2 b/media-sound/audio-entropyd/files/audio-entropyd.init-2
new file mode 100644
index 000000000000..082fcbcd57fd
--- /dev/null
+++ b/media-sound/audio-entropyd/files/audio-entropyd.init-2
@@ -0,0 +1,26 @@
+#!/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/audio-entropyd/files/audio-entropyd.init-2,v 1.1 2009/11/12 09:54:21 angelos Exp $
+
+depend() {
+	need modules
+	use alsasound
+}
+
+start() {
+	local params=""
+	[ -n "$DEVICE" ] && params="$params -d $DEVICE"
+	[ -n "$SAMPLERATE" ] && params="$params -N $SAMPLERATE"
+
+	ebegin "Starting audio entropy gathering daemon"
+	start-stop-daemon --start --quiet --pidfile /var/run/audio-entropyd.pid \
+		--exec /usr/sbin/audio-entropyd -- ${params}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping audio entropy gathering daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/audio-entropyd.pid
+	eend ${?}
+}