Author: djrzulf Date: Mon Feb 28 12:34:30 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- NFY,
---- Files affected:
SOURCES:
ices.init (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SOURCES/ices.init
diff -u SOURCES/ices.init:1.11 SOURCES/ices.init:1.12
--- SOURCES/ices.init:1.11 Sun Jan 16 10:04:01 2005
+++ SOURCES/ices.init Mon Feb 28 13:34:25 2005
@@ -24,12 +24,13 @@
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 [EMAIL PROTECTED]
+[ -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 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/ices.init?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
