From e98aa5c28f3a9ab145506c6da4812b9dc050814e Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 18 Feb 2009 13:38:43 +0100
Subject: [PATCH] Change mpfire default path to /var/mp3 removed empty database
 from packet (if path is not "/" it will autobuild) removed unused
 cdrom_corever

---
 config/mpfire/mpd.db             | 6 ------
 config/rootfiles/cdrom_corever   | 1 -
 config/rootfiles/packages/mpfire | 4 ++--
 html/cgi-bin/mpfire.cgi          | 2 +-
 lfs/mpd                          | 3 +--
 lfs/mpfire                       | 3 +--
 src/initscripts/init.d/mpd       | 1 +
 7 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 config/mpfire/mpd.db
 delete mode 100644 config/rootfiles/cdrom_corever

diff --git a/config/mpfire/mpd.db b/config/mpfire/mpd.db
deleted file mode 100644
index eff0befe93..0000000000
--- 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
index 7273c0fa8c..0000000000
--- a/config/rootfiles/cdrom_corever
+++ /dev/null
@@ -1 +0,0 @@
-25
diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire
index 2efb26ee34..74915302ec 100644
--- 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 ae86226747..6b06d3b640 100644
--- 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 3c9dff8a6c..923b30b228 100644
--- 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 b163a95292..098ffbbb33 100644
--- 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 3e9c59a033..4733326e9a 100644
--- 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
 		;;
-- 
2.39.2