do not set volume at boot, audio mixer script to rescue

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@34831 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 5 insertions, 5 deletions

diff --git a/tools/Linux/packaging/debian/xbmc-live.postinst b/tools/Linux/packaging/debian/xbmc-live.postinst
index c3c7a7bdcd..f6b0e69390 100755
--- a/tools/Linux/packaging/debian/xbmc-live.postinst
+++ b/tools/Linux/packaging/debian/xbmc-live.postinst
@@ -207,7 +207,7 @@ ENDOFBLOCK
 
 	if [ -f /boot/grub/grub.cfg ]; then
 		if ! grep -q -i "xbmc=autostart" /etc/default/grub ; then
-			sed -i -e "/^GRUB_CMDLINE_LINUX_DEFAULT=/s/\"\(.*\)\"/\"\1 xbmc=autostart,nodiskmount,setvolume loglevel=0\"/" /etc/default/grub
+			sed -i -e "/^GRUB_CMDLINE_LINUX_DEFAULT=/s/\"\(.*\)\"/\"\1 xbmc=autostart,nodiskmount loglevel=0\"/" /etc/default/grub
 			update-grub
 		fi
 	fi
diff --git a/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant b/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant
index 55f075a6d1..4d807fbdc3 100755
--- a/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant
+++ b/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant
@@ -29,7 +29,7 @@ if [ -f /target/boot/grub/grub.cfg ]; then
 	# Set our own defaults
 	echo  >> /target/etc/default/grub
 	echo '# Defaults from XBMC Installation' >> /target/etc/default/grub
-	echo 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash xbmc=autostart,nodiskmount,setvolume loglevel=0 video=vesafb"' >> /target/etc/default/grub
+	echo 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash xbmc=autostart,nodiskmount loglevel=0 video=vesafb"' >> /target/etc/default/grub
 	echo 'GRUB_GFXMODE="800x600"' >> /target/etc/default/grub
 	echo 'GRUB_GFXPAYLOAD_LINUX="800x600"' >> /target/etc/default/grub
 
diff --git a/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant b/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant
index e1393022a0..f888352acf 100644
--- a/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant
+++ b/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant
@@ -33,14 +33,14 @@ fi
 menuentry "XBMCLive" {
  set quiet=1
  set gfxpayload="800x600"
- linux /live/vmlinuz video=vesafb boot=live xbmc=autostart,nodiskmount,setvolume,noalsaconfig splash quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs
+ linux /live/vmlinuz video=vesafb boot=live xbmc=autostart,nodiskmount splash quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs
  initrd /live/initrd.img
 }
 
 menuentry "XBMCLive, SAFE MODE" {
  set quiet=1
  set gfxpayload=text
- linux /live/vmlinuz boot=live xbmc=nodiskmount,setvolume,noalsaconfig quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs
+ linux /live/vmlinuz boot=live xbmc=nodiskmount quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs
  initrd /live/initrd.img
 }
 
diff --git a/tools/XBMCLive/SDK/copyFiles-addons.sh.lucid-variant b/tools/XBMCLive/SDK/copyFiles-addons.sh.lucid-variant
index e75c205e61..e2a7603708 100755
--- a/tools/XBMCLive/SDK/copyFiles-addons.sh.lucid-variant
+++ b/tools/XBMCLive/SDK/copyFiles-addons.sh.lucid-variant
@@ -21,7 +21,7 @@
 echo "Retrieving addons..."
 
 repoURL="http://mirrors.xbmc.org/addons/dharma-pre/"
-ADDONSLIST=(script.bootable.disk.wizard script.rss.editor)
+ADDONSLIST=(script.bootable.disk.wizard script.rss.editor script.xbmc.audio.mixer)
 
 mkdir -p $WORKPATH/buildLive/Files/chroot_local-includes/usr/share/xbmc/addons &> /dev/null