xbmc-pvr: sync init scripts with last merge

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-pvr/init.d/91_setup-addons

@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# setup XBMC addons
+#
+# runlevels: openelec, textmode
+
+case $RUNLEVEL in
+  boot)
+    progress "setup XBMC addons"
+
+    # hack: add addons to $PATH
+      for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
+        PATH="$PATH:$i"
+      done
+      export PATH
+
+    # hack: make addon-bins executable
+      chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac
+
+

packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc

@@ -22,6 +22,8 @@
 #
 # runlevels: openelec
 
+case $RUNLEVEL in
+  boot)
     progress "setup XBMC"
 
     #
@@ -131,3 +133,8 @@ EOF
         fi
         echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
       fi
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac

packages/mediacenter/xbmc-pvr/init.d/93_xbmc

@@ -22,6 +22,8 @@
 #
 # runlevels: openelec
 
+case $RUNLEVEL in
+  boot)
     LIRCDEV="/var/run/lirc/lircd"
     [ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
     XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
@@ -33,9 +35,6 @@ if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
       export SDL_MOUSE_RELATIVE=0
     fi
 
-# hack: make addon-bins executable
-  chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
-
     # starting autostart script (will be removed later again, dont use it!!!)
       AUTOSTART="/storage/.config/autostart.sh"
       if [ -f $AUTOSTART ]; then
@@ -55,7 +54,7 @@ fi
     # set cpu's to 'on demand'
       ( usleep 15000000
         progress "set cpu's to 'on demand'"
-    cpupower frequency-set -g ondemand
+        cpupower frequency-set -g ondemand > /dev/null 2>&1
       )&
 
     # starting XBMC
@@ -66,13 +65,13 @@ fi
 
         case "$RET" in
           0)
-        poweroff -f
+             RUNLEVEL="poweroff"
             ;;
           64)
-        poweroff -f
+             RUNLEVEL="poweroff"
             ;;
           66)
-        reboot
+             RUNLEVEL="reboot"
             ;;
           255)
             echo "Abnormal Exit. Exited with code $RET"
@@ -85,3 +84,8 @@ fi
 
         usleep 250000
       done
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac