mpd hang if we try to update an empty db to new version

change default mpfire path to /var/mp3

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index 685b33bcd6b475e7a268b10d44b5093fe581c8f5..ae2460c223f4fdf84b31fa2781531614a47a701c 100644 (file)
--- 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 5ebeb74eb620cd0927deb6aed305cf94b39ab3ac..eff0befe931f7d3848ce87fb738d0d8026a14cb3 100644 (file)
--- 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 84ae5992663fb68c0dabc150f21d550c75bf064d..2efb26ee34f60b76eaecb120518084ca6f1c3929 100644 (file)
--- 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 00a0362859d57d582d28333fd0f4ff842fb34ad7..3c9dff8a6ca142732a564ca1b50651f4a1082b64 100644 (file)
--- 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)