From 96742484c562ccc84c5c41c8bef59f7d49043b6c Mon Sep 17 00:00:00 2001
From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 22 Sep 2007 19:35:04 +0000
Subject: [PATCH] MPFire und Samba Pakete angepasst

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@910 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 config/mpfire/mpfire.pl | 6 +++---
 html/cgi-bin/samba.cgi  | 2 +-
 lfs/mpfire              | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/mpfire/mpfire.pl b/config/mpfire/mpfire.pl
index 970b76bb34..78d1aec34d 100644
--- a/config/mpfire/mpfire.pl
+++ b/config/mpfire/mpfire.pl
@@ -14,7 +14,7 @@ system("/etc/init.d/mpd start >/dev/null");
 if ($ARGV[0] eq 'scan') {
   if ($debug){print "Creating Database\n";}
   system("mpd --create-db >/dev/null");
-  system("/etc/init.d/mpd restart");
+  system("/etc/init.d/mpd restart >/dev/null");
 }
 elsif ($ARGV[0] eq 'play') {
   &checkmute();
@@ -106,10 +106,10 @@ sub checkmute(){
   my @PCM = split(/ /,$temp);
  if ( $PCM[7] =~  /off/ ){
   if ($debug){print "PCM was muted - umuting.\n";}
-  system("amixer set PCM toggle");
+  system("amixer set PCM toggle >/dev/null");
   }
  if ( $Master[7] =~ /off/ ){
   if ($debug){print "Master was muted - umuting.\n";}
-  system("amixer set Master toggle");
+  system("amixer set Master toggle >/dev/null");
   } 
 }
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 818b5c5be8..97471c72c2 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -829,7 +829,7 @@ foreach my $shareentry (sort @Shares)
 			<input type='hidden' name='ACTION' value='sharechange' />
 			<input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
 	</form></td>
-	<td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}>
+	<td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
 			<input type='hidden' name='NAME' value='$shareentry' />
 			<input type='hidden' name='ACTION' value='smbsharedel' />
 			<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
diff --git a/lfs/mpfire b/lfs/mpfire
index 848e427947..e42c741e51 100644
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -61,9 +61,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	touch /var/ipfire/mpfire/{settings,playlist.m3u}
 	touch /var/ipfire/mpfire/db/mpd.db
 	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 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
 	install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
 	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
 	@$(POSTBUILD)
-- 
2.39.2