- NFY,

Changed files:
    ices.init -> 1.12

diff --git a/ices.init b/ices.init
index a8461ccaa7c58aef150ab17dc08807aa8c8bf4e0..5bd6dc07b6939dadfc607429fe57b2f024998129 100644 (file)
--- a/ices.init
+++ b/ices.init
@@ -24,12 +24,13 @@ else
 fi
 
 # Check that ices.conf exists.
-[ -f /etc/icecast/ices.conf ] || (echo \
-'There are two config files:
-/etc/icecast/ices.conf.dist - default config (you must have XML support);
-/etc/icecast/ices.conf.txt - text config file made for PLD by jack@pld-linux.org
+[ -f /etc/icecast/ices.xml ] || (echo \
+'There are three config files:
+/etc/icecast/ices-oss.xml - conf for oss;
+/etc/icecast/ices-alsa.xml - conf for alsa;
+/etc/icecast/ices-playlist.xml - conf for playlist;
 After choosing one of them you have to configure it before run and rename 
-to /etc/icecast/ices.conf. Enjoy!                             Your PLD Team'\
+to /etc/icecast/ices.xml. Enjoy!                             Your PLD Team'\
 && exit 0)
 
 
@@ -42,15 +43,7 @@ case "$1" in
                msg_starting ices
                # daemon --user icecast -s /bin/sh 'ices'
                # Our daemon function doesn't include su's --shell function
-               [ -f /etc/icecast/ices.conf ] && \
-               ICES_CONFIG=`file /etc/icecast/ices.conf|grep XML`
-               if [ ${ICES_CONFIG} = "" ]; then
-                       su icecast -s /bin/sh -c 'ices -c /etc/icecast/ices.conf'
-               else 
-                       . /etc/icecast/ices.conf
-                       su icecast -s /bin/sh -c "ices ${ICES_OPTIONS}"
-               fi
-               ok
+               su icecast -s /bin/sh -c 'ices /etc/ices/ices.xml'
                touch /var/lock/subsys/ices
        else
                msg_already_running ices