Proper mangling of menu.lst

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

3 files changed, 21 insertions, 40 deletions

diff --git a/tools/XBMCLive/SDK/buildLive/Files/binary_grub/menu.lst b/tools/XBMCLive/SDK/buildLive/Files/binary_grub/menu.lst
index d2026919d5..5d5bd51746 100644
--- a/tools/XBMCLive/SDK/buildLive/Files/binary_grub/menu.lst
+++ b/tools/XBMCLive/SDK/buildLive/Files/binary_grub/menu.lst
@@ -7,6 +7,7 @@ background 333333
 
 splashimage=/boot/grub/splash.xpm.gz
 
+## BEGIN NVIDIA ##
 
 title  XBMCLive - NVIDIA GPU
 kernel /live/vmlinuz boot=live vga=788 xbmc=autostart,tempfs,nodiskmount,setvolume splash quiet loglevel=0 module=nvidia 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
@@ -20,6 +21,10 @@ initrd /live/initrd.img
 quiet
 boot
 
+## END NVIDIA ##
+
+## BEGIN AMD ##
+
 title  XBMCLive - ATI/AMD GPU
 kernel /live/vmlinuz boot=live vga=788 xbmc=autostart,tempfs,nodiskmount,setvolume splash quiet loglevel=0 module=amd 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
@@ -32,6 +37,10 @@ initrd /live/initrd.img
 quiet
 boot
 
+## END AMD ##
+
+## BEGIN INTEL ##
+
 title  XBMCLive - Intel GPU
 kernel /live/vmlinuz boot=live vga=788 xbmc=autostart,tempfs,nodiskmount,setvolume 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
@@ -44,9 +53,13 @@ initrd /live/initrd.img
 quiet
 boot
 
+## END INTEL ##
+
 title  ---
 root
 
+## BEGIN INSTALLER ##
+
 title  Install XBMCLive to disk
 kernel /install/vmlinuz vga=normal quiet preseed/file=/cdrom/install/preseed.cfg cdrom-detect/try-usb=true priority=critical -- 
 initrd /install/initrd.gz
@@ -56,6 +69,8 @@ boot
 title  ---
 root
 
+## END INSTALLER ##
+
 title Boot Operating System on Hard Disk
 root (hd0)
 savedefault
diff --git a/tools/XBMCLive/SDK/liveOnlyHook.sh b/tools/XBMCLive/SDK/liveOnlyHook.sh
index b29cdf3bdf..a810d89e91 100755
--- a/tools/XBMCLive/SDK/liveOnlyHook.sh
+++ b/tools/XBMCLive/SDK/liveOnlyHook.sh
@@ -23,3 +23,7 @@ echo "tmpfs /var/tmp tmpfs defaults 0 0" >> /etc/fstab
 EOF
 
 chmod +x $WORKPATH/buildLive/Files/chroot_local-hooks/02-setFstab
+
+
+# Modify menu.lst
+sed -i '/## BEGIN INSTALLER ##/,/## END INSTALLER ##/d' $WORKPATH/buildLive/Files/binary_grub/menu.lst
diff --git a/tools/XBMCLive/SDK/nvidiaOnlyHook.sh b/tools/XBMCLive/SDK/nvidiaOnlyHook.sh
index 99e9fdcec6..8e0ed23b52 100644
--- a/tools/XBMCLive/SDK/nvidiaOnlyHook.sh
+++ b/tools/XBMCLive/SDK/nvidiaOnlyHook.sh
@@ -38,44 +38,6 @@ export DONOTBUILDRESTRICTEDDRIVERS=1
 
 
 # Modify menu.lst
-# TODO mangle the existing one instead of creating a new one
-#
-cat >  $WORKPATH/buildLive/Files/binary_grub/menu.lst << 'EOF'
-default 0
-timeout 10
-
-foreground eeeeee
-background 333333
-
-splashimage=/boot/grub/splash.xpm.gz
-
-
-title  XBMCLive
-kernel /live/vmlinuz boot=live vga=788 xbmc=autostart,tempfs,nodiskmount,setvolume 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
-quiet
-boot
-
-title  XBMCLive - SAFE MODE
-kernel /live/vmlinuz boot=live vga=788 xbmc=tempfs,nodiskmount,setvolume 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
-quiet
-boot
-
-title  ---
-root
-
-title Boot Operating System on Hard Disk
-root (hd0)
-savedefault
-makeactive
-chainloader +1
-quiet
-boot
-
-title Memory test (memtest86+)
-kernel /live/memtest   
-quiet
-boot
-EOF
+sed -i '/## BEGIN AMD ##/,/## END AMD ##/d' $WORKPATH/buildLive/Files/binary_grub/menu.lst
+sed -i '/## BEGIN INTEL ##/,/## END INTEL ##/d' $WORKPATH/buildLive/Files/binary_grub/menu.lst