From 64f07449b96ead5aafc92a5f79de4a9de168b6da Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 6 Sep 2007 18:55:37 +0000 Subject: [PATCH] Weitere Improvements am MPFire. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@877 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/packages-list.txt | 2 -- html/html/images/media-skip-backward.png | Bin 576 -> 849 bytes lfs/mpd | 2 ++ lfs/mpfire | 2 -- src/misc-progs/syslogdctrl.c | 2 +- src/paks/alsa/install.sh | 6 +++--- src/paks/mpfire/install.sh | 6 +++--- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f23a94ff70..adafbdb2a7 100644 --- 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 GIT binary patch delta 837 zc-jF)1G@ac1knbN8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z001CkNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L z01FZT01FZU(%pXi00007bV*G`2h|J)5iJ|p7tf^t000paWn6+Q9|HoM?7|#Q8vCl2|ZE9Hf93 zh$W!%0#F0kfwVYW4>u3DWN=8}e;DTG=91*$;pXJy;}zrM<&~6?k#TTzbeP1$!z0Yj z&MwW$%Bn9dEq`qf5(BAaP*PF`8}R4PZ?GZCK)$M~s-%>Zl(DV7^#o5Z_isS_QAkKg zS42d_$kx`n2gv{K!`Sa($ufO+qD=YI1 zA0MwLnK>DsfByXO-`5W)2Gq+C6c{8K8y5|B0f>%{i+?(km!I?Y-TQa{{`~#(|M&0T z|0AQq|D~iQeSZD=6BIl$FQ5Fs|L87Qe9P8N|37{H z@c+fDXMg`6K*e(Nvc5M0^)k$uIYTlhHxsN7L^n0p-(020g07W7Jr{HV}>Nd#tj=J%gT$u27u@dKz?&;W5>ivJ?~GRKK2b{ zNONn$_jwEFr1nnee7AnXnjavs#^&1ZAhir9PJbMitgEjC8vvqD96v63>hx)eg9i^P zPMF-YWX`%27@0z ze?GDS<6I1gC4g8EB=-IL4`v|d2dP6=i#JaKEno*>WJN$eBM^h~3S|HQ$D*|aplF); P00000NkvXXu0mjfGLwjM delta 562 zc-jFn0?qx=2EYW68Gix*005AYXf^-<010qNS#tmY3ljhU3ljkVnw%H_00HtzL_t(| zoXwI?YZFlv#qXP$&b)bVOiUtk??e}oHZ?_~C>pzI1(8zx0P5a;4k;DUmGlGnhhP>e z{x8)kSqP<7QUyyF>M{#cS`ZPF%$rP@=OS8M3GO_*-&x$l<$oN2|4vMLa(a4d081}k zGR6$U01c^hx>y`pTYDGBagrpy?~jfa8;ypAJ^{eJyZ6suI7b*5rqStihKu_>=>dRk z+nn>Uu>;;Nk1<9V7(qZgaZxWKqT?ryovc(Ao-JBKR;g4RAFmubQhxIIscD)RkcB=9 z;R1jV;?(KMTz@7zJ3E(3rF5b_=^^6PE7vmFtWLBL!ZK}(0{YSZK1i6qKA%qQR=u#( zZVMr2F3wC$Osbw5p!8%e<649m_agw{oNsM!*|yyc+bW8rl%Wb$6n4X|QlXSm3b7}L zhEM1?HUKz|{pjI?SM?>A%RKEf40C05xmK&%L(TwQ>3<@k5g`5k!983)`sw56YW3!a z_4jc<7D93%Z&z)``ed-J`&^kZd+HAJIY+^u6YrWHhQp$B* z08mlH;47E!I6Mp$003wJV1Jp-;1*--PyA>71nR=Dd_@pR7ytkO07*qoM6N<$f}l$F AIRF3v diff --git a/lfs/mpd b/lfs/mpd index ee516ea7d5..86d8e2902a 100644 --- 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 46b99d8705..9cea6a5e4c 100644 --- 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 aee7c7a38e..c856a8d44b 100644 --- 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 1a6724d562..13789ac28d 100644 --- 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 4ceb82c989..f45b5f8d53 100644 --- 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 -- 2.39.2