Weitere Improvements am MPFire.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@877 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f23a94ff7054c0605932f6d9d780a91928b1dd76..adafbdb2a701b472a969a1624f1d46abfaf15c2e 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -18,8 +18,6 @@
 * Linux-PAM-0.99.4.0
 * Locale-Codes-2.07
 * MIME-tools-5.420
-* MP3-Info-1.22
-* MP3-Tag-0.9709
 * Mail-SpamAssassin-3.1.3
 * MailTools-1.74
 * MoBlock-0.8

diff --git a/html/html/images/media-skip-backward.png b/html/html/images/media-skip-backward.png
index 241b9d138733b1e8daeb1a735e2041a3a9eabadc..ef9de67e98793f88e7f505fae02cfccc2f144f27 100644 (file)
Binary files a/html/html/images/media-skip-backward.png and b/html/html/images/media-skip-backward.png differ

diff --git a/lfs/mpd b/lfs/mpd
index ee516ea7d53d902bd90c81e0dbe36faedde5a71b..86d8e2902aa158f90362e7570b034d0dfb7e1ae8 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -81,4 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
+       touch /var/log/mpd.error.log
+       touch /var/log/mpd.log
        @$(POSTBUILD)

diff --git a/lfs/mpfire b/lfs/mpfire
index 46b99d870537fa465431de0adf55e3cdb3d080e2..9cea6a5e4c473c1c40aa5b476d6d924b5dfb503c 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -60,8 +60,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -p /var/ipfire/mpfire/{bin,db}
        touch /var/ipfire/mpfire/{settings,playlist.m3u}
        touch /var/ipfire/mpfire/db/mpd.db
-       touch /var/log/mpd_error.log
-       touch /var/log/mpd.log
        install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin
        install -v -m 644 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
        install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index aee7c7a38ebf41a07d516ca761c987a10b23c8ca..c856a8d44ba1eb6f39b19a43144bdff8f57cc7b6 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -112,7 +112,7 @@ int main(void)
    else
       snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
       
-      snprintf(buffer, STRING_SIZE - 1, "/bin/sed 's/*.\\/var\\/log\\/messages/%s           \\/var\\/log\\/messages/' /etc/syslog.conf >&%d", varmessages, config_fd );
+      snprintf(buffer, STRING_SIZE - 1, "/bin/sed 's/.*\\/var\\/log\\/messages.*/%s           \\/var\\/log\\/messages/' /etc/syslog.conf >&%d", varmessages, config_fd );
 
    /* if the return code isn't 0 failsafe */
    if ((rc = unpriv_system(buffer,99,99)) != 0)

diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh
index 1a6724d562c988b784d27332a3aaa5ec865a9055..13789ac28dff3e3128d93e65047d5541d9543885 100644 (file)
--- a/src/paks/alsa/install.sh
+++ b/src/paks/alsa/install.sh
@@ -4,6 +4,6 @@
 extract_files
 
 touch /etc/asound.state
-ln -svf  /etc/init.d/alsa /etc/rc.d/rc3.d/S65alsa
-ln -svf  /etc/init.d/alsa /etc/rc.d/rc0.d/K35alsa
-ln -svf  /etc/init.d/alsa /etc/rc.d/rc6.d/K35alsa
+ln -svf  ../init.d/alsa /etc/rc.d/rc3.d/S65alsa
+ln -svf  ../init.d/alsa /etc/rc.d/rc0.d/K35alsa
+ln -svf  ../init.d/alsa /etc/rc.d/rc6.d/K35alsa

diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index 4ceb82c989b4d667e7ec2e6e7fa8113866ec4d7b..f45b5f8d53c7630de298b42260bd389d1c0f8899 100644 (file)
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -3,8 +3,8 @@
 
 extract_files
 chown nobody.nobody -Rv /var/ipfire/mpfire
-ln -svf  /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd
-ln -svf  /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
-ln -svf  /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
+ln -svf  ../init.d/mpd /etc/rc.d/rc3.d/S65mpd
+ln -svf  ../init.d/mpd /etc/rc.d/rc0.d/K35mpd
+ln -svf  ../init.d/mpd /etc/rc.d/rc6.d/K35mpd
 touch /var/log/mpd.error.log
 touch /var/log/mpd.log