From 0de3eea43d421bd9e2f9fbf090e16a89d673f141 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 16 Feb 2009 07:07:12 +0100 Subject: [PATCH] mpd hang if we try to update an empty db to new version change default mpfire path to /var/mp3 --- config/mpfire/mpd.conf | 2 +- config/mpfire/mpd.db | 2 +- config/rootfiles/packages/mpfire | 1 + lfs/mpd | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf index 685b33bcd6..ae2460c223 100644 --- a/config/mpfire/mpd.conf +++ b/config/mpfire/mpd.conf @@ -4,7 +4,7 @@ ##################### REQUIRED ########################### port "6600" -music_directory "/" +music_directory "/var/mp3" playlist_directory "/var/ipfire/mpfire" log_file "/var/log/mpd.log" error_file "/var/log/mpd.error.log" diff --git a/config/mpfire/mpd.db b/config/mpfire/mpd.db index 5ebeb74eb6..eff0befe93 100644 --- a/config/mpfire/mpd.db +++ b/config/mpfire/mpd.db @@ -1,5 +1,5 @@ info_begin -mpd_version: 0.13.0 +mpd_version: MPD_VERSION fs_charset: UTF-8 info_end songList begin diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire index 84ae599266..2efb26ee34 100644 --- a/config/rootfiles/packages/mpfire +++ b/config/rootfiles/packages/mpfire @@ -33,6 +33,7 @@ var/ipfire/mpfire/mpd.conf var/ipfire/mpfire/playlist.m3u var/ipfire/mpfire/settings var/ipfire/mpfire/webradio +var/mp3/info usr/local/bin/mpfirectrl srv/web/ipfire/cgi-bin/mpfire.cgi srv/web/ipfire/html/images/mpfire diff --git a/lfs/mpd b/lfs/mpd index 00a0362859..3c9dff8a6c 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -83,4 +83,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) touch /var/log/mpd.error.log touch /var/log/mpd.log + sed -i 's/MPD_VERSION/$(VER)/' /var/ipfire/mpfire/db/mpd.db @$(POSTBUILD) -- 2.39.2