Change mpfire default path to /var/mp3

removed empty database from packet (if path is not "/" it will autobuild)
removed unused cdrom_corever

diff --git a/config/mpfire/mpd.db b/config/mpfire/mpd.db
deleted file mode 100644 (file)
index eff0bef..0000000
--- a/config/mpfire/mpd.db
+++ /dev/null
@@ -1,6 +0,0 @@
-info_begin
-mpd_version: MPD_VERSION
-fs_charset: UTF-8
-info_end
-songList begin
-songList end

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
deleted file mode 100644 (file)
index 7273c0f..0000000
--- a/config/rootfiles/cdrom_corever
+++ /dev/null
@@ -1 +0,0 @@
-25

diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire
index 2efb26ee34f60b76eaecb120518084ca6f1c3929..74915302ec8a44139901b9e9d79565e0fbd7df74 100644 (file)
--- a/config/rootfiles/packages/mpfire
+++ b/config/rootfiles/packages/mpfire
@@ -27,8 +27,8 @@ var/ipfire/menu.d/EX-mpfire.menu
 var/ipfire/mpfire
 var/ipfire/mpfire/bin
 var/ipfire/mpfire/bin/mpfire.pl
-var/ipfire/mpfire/db
-var/ipfire/mpfire/db/mpd.db
+#var/ipfire/mpfire/db
+var/ipfire/mpfire/db/info
 var/ipfire/mpfire/mpd.conf
 var/ipfire/mpfire/playlist.m3u
 var/ipfire/mpfire/settings

diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index ae86226747051f6087dac044c8f2813ebeb92010..6b06d3b640bd35cd6ac676fa71b1b6db20ce7068 100644 (file)
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -317,7 +317,7 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){
 ############################################################################################################################
 ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ####################################
 
-$mpfiresettings{'MUSICDIR'} = "/";
+$mpfiresettings{'MUSICDIR'} = "/var/mp3";
 &General::readhash("${General::swroot}/mpfire/settings", \%mpfiresettings);
 
 ############################################################################################################################

diff --git a/lfs/mpd b/lfs/mpd
index 3c9dff8a6ca142732a564ca1b50651f4a1082b64..923b30b2287ae705643678b404916f9fc3d05d2e 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = "alsa ffmpeg libshout libogg libmad libid3tag libvorbis"
 
@@ -83,5 +83,4 @@ $(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)

diff --git a/lfs/mpfire b/lfs/mpfire
index b163a95292833f5b8aa318543d916d06b2c92aa9..098ffbbb33b3bd7d875f2a8a4b0188036917789e 100644 (file)
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -62,10 +62,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin
        install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
        install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
-       install -v -m 644 $(DIR_SRC)/config/mpfire/mpd.db /var/ipfire/mpfire/db/mpd.db
+       echo "Folder for mpd database" > /var/ipfire/mpfire/db/info
        chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u}
        chown nobody.nobody /var/ipfire/mpfire/{settings,webradio}
-       chown root.nobody /var/ipfire/mpfire/db/mpd.db
        chmod 664 /var/ipfire/mpfire/playlist.m3u
        chmod 755 /srv/web/ipfire/html/images/mpfire
        install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire

diff --git a/src/initscripts/init.d/mpd b/src/initscripts/init.d/mpd
index 3e9c59a0334ff7b0e4cea323941d6416d19ff1de..4733326e9ae322b1d85de7161bf9655e254220e3 100644 (file)
--- a/src/initscripts/init.d/mpd
+++ b/src/initscripts/init.d/mpd
@@ -12,6 +12,7 @@
 case "$1" in
        start)
                boot_mesg "Starting MPD..."
+               chown -R root.nobody /var/ipfire/mpfire/db
                /bin/nice --5 /usr/bin/mpd
     evaluate_retval
                ;;