MPFire und Samba Pakete angepasst

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@910 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/mpfire/mpfire.pl b/config/mpfire/mpfire.pl
index 970b76bb34be97dfa5a513b518effe8abc846287..78d1aec34dd60ec4c9bfe9adddb89c68fc7be3fe 100644 (file)
--- 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 818b5c5be877e754722e64c067402499ed92993a..97471c72c20c49b5e6b962e68a310da99ba0863c 100644 (file)
--- 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 848e4279470a3e1e2fb5aea6e41655ad1cb56139..e42c741e513546de69a5c3d999af189ce906568c 100644 (file)
--- 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)