reverting init script change (seems to be a baselayout _pre issue)

(Portage version: 2.0.51.22-r2)

2 files changed, 15 insertions, 16 deletions

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index 9bd1b81fb679..a98659396079 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/edna
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.22 2005/09/09 04:59:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.23 2005/09/09 22:04:04 nerdboy Exp $
+
+  09 Sep 2005; Steve Arnold <nerdboy@gentoo.org> files/edna.gentoo:
+  reverting init script change (seems to be a baselayout _pre issue)
 
 *edna-0.5-r5 (09 Sep 2005)
 
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 1d96de7c56db..cf46fc45398f 100644
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 #
-# Startup script for the edna audio server 
+# Startup script for the edna mp3 mini server 
 #
-# description: edna is a mini mp3/ogg webserver
+# description: edna is a mini mp3 webserver
 # processname: python
 # pidfile: /var/run/ednad.pid
-# config: /etc/edna/edna.conf
+# config:
 
 export PYTHONPATH=/usr/lib/edna
 EDNA=/usr/bin/edna
@@ -13,22 +13,18 @@ EDNACONF=/etc/edna/edna.conf
 PIDFILE=/var/run/edna.pid
 
 depend() {
-        use net
-	need local
+        need local
 }
 
 start() {
-    ebegin "Starting edna mp3 server"
-    start-stop-daemon --quiet --pidfile $PIDFILE
-    $EDNA --daemon $EDNACONF
-    eend $? "Failed to start edna"
+    ebegin "Starting ednad mp3 server"
+    start-stop-daemon -m -b --start --quiet --pidfile $PIDFILE \
+    --exec $EDNA -- $EDNACONF
+    eend $?
 }
 
 stop() {
-    ebegin "Stopping edna mp3 server"
-    start-stop-daemon --stop -o --quiet --pidfile $PIDFILE
-    local ret=$?
-    eend ${ret} "Failed to stop edna"
-    rm -f $PIDFILE
-    return ${ret}
+    ebegin "Stopping ednad"
+    start-stop-daemon -o --quiet --stop --pidfile $PIDFILE
+    eend $?
 }