[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn25756.rc1.deb1-71-gd4484a9

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d4484a9f5add31cf043bd39886b587978a5d7a76
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Dec 16 11:27:53 2009 -0500

    Import changes to xbmc-live init and maintainer scripts from upstream.

diff --git a/debian/xbmc-live.init b/debian/xbmc-live.init
index 9163ef5..6552bd9 100755
--- a/debian/xbmc-live.init
+++ b/debian/xbmc-live.init
@@ -80,7 +80,7 @@ do_start()
 			fi
 		fi
 
-		RUNX="$(echo $CMDLINE | grep splash)"
+		RUNX="$(echo $XBMC_PARAMS | grep autostart)"
 		if [ ! -n "$RUNX" ]; then
 		        log_warning_msg "Not starting X."
 
diff --git a/debian/xbmc-live.postinst b/debian/xbmc-live.postinst
index 580c3fa..e1c3bc5 100755
--- a/debian/xbmc-live.postinst
+++ b/debian/xbmc-live.postinst
@@ -172,6 +172,23 @@ ENDOFBLOCK
 			polkit-auth --user $xbmcUser --grant $ACTION
 		fi
 	done
+
+
+	# Add <xbmc=autostart,nodiskmount,setvolume loglevel=0> to grub's kernel entries
+	if [ -f /boot/grub/menu.lst ]; then
+		if ! grep -q -i "xbmc=autostart" /boot/grub/menu.lst ; then
+			# TODO Do not modify single-mode entry
+			sed -i -e "/^kernel/s/\(.*\)/\1 xbmc=autostart,nodiskmount,setvolume loglevel=0/" /boot/grub/menu.lst
+			sed -i -e "/^# kopt=root=/s/\(.*\)/\1 xbmc=autostart,nodiskmount,setvolume loglevel=0/" /boot/grub/menu.lst
+		fi
+	fi
+
+	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
+			update-grub
+		fi
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/xbmc-live.postrm b/debian/xbmc-live.postrm
index c1e14c8..57de236 100755
--- a/debian/xbmc-live.postrm
+++ b/debian/xbmc-live.postrm
@@ -93,6 +93,21 @@ if [ "$1" = "purge" ]; then
 	if [ -f "/etc/init/xbmc-live-install" ]; then
 		rm /etc/init/xbmc-live-install.conf >/dev/null
 	fi
+
+
+	# Remove <xbmc=* > from grub's kernel entries
+	if [ -f /boot/grub/menu.lst ]; then
+		if grep -q -i "xbmc=" /boot/grub/menu.lst ; then
+			sed -i -e "s/xbmc=autostart,nodiskmount,setvolume loglevel=0//" /boot/grub/menu.lst
+		fi
+	fi
+
+	if [ -f /boot/grub/grub.cfg ]; then
+		if grep -q -i "xbmc=" /etc/default/grub ; then
+			sed -i -e "s/xbmc=autostart,nodiskmount,setvolume loglevel=0//" /etc/default/grub
+			update-grub
+		fi
+	fi
 fi
 
 update-rc.d -f xbmc-live remove >/dev/null

-- 
xbmc packaging