Revert "xbmc: start init scripts on RUNLEVEL=boot"

This reverts commit 2e59361b8235657c84d26f02f669b0cbcd5bdc8f.
This commit is contained in:
Stephan Raue 2011-09-12 19:27:53 +02:00
parent 314bf5ce93
commit 6ba475460b
2 changed files with 98 additions and 112 deletions

View File

@ -22,21 +22,19 @@
# #
# runlevels: openelec # runlevels: openelec
case $RUNLEVEL in progress "setup XBMC"
boot)
progress "setup XBMC"
# #
# clean temp dir # clean temp dir
# #
rm -rf $HOME/.xbmc/temp/* rm -rf $HOME/.xbmc/temp/*
# #
# add some default settings # add some default settings
# #
mkdir -p $HOME/.xbmc/userdata mkdir -p $HOME/.xbmc/userdata
# use dds fanarts by default # use dds fanarts by default
if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
<advancedsettings> <advancedsettings>
@ -51,9 +49,9 @@ case $RUNLEVEL in
EOF EOF
fi fi
# #
# setup directories for XBMC sources # setup directories for XBMC sources
# #
[ ! -d "$HOME/music" ] && mkdir -p $HOME/music [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
[ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
@ -94,9 +92,9 @@ EOF
EOF EOF
fi fi
# #
# common setup guisettings # common setup guisettings
# #
mkdir -p $HOME/.xbmc/userdata mkdir -p $HOME/.xbmc/userdata
@ -111,17 +109,17 @@ EOF
</debug> </debug>
EOF EOF
# #
# include project specific options # include project specific options
# #
if [ -f /usr/share/xbmc/config/guisettings.xml ]; then if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
fi fi
# #
# common setup for amd and nvidia graphic # common setup for amd and nvidia graphic
# #
# Always sync to vblank # Always sync to vblank
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
@ -133,8 +131,3 @@ EOF
fi fi
echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
fi fi
;;
poweroff|reboot)
;;
esac

View File

@ -22,23 +22,21 @@
# #
# runlevels: openelec # runlevels: openelec
case $RUNLEVEL in LIRCDEV="/var/run/lirc/lircd"
boot) [ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
LIRCDEV="/var/run/lirc/lircd" XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
progress "starting XBMC" progress "starting XBMC"
# hack for Boxee Remote # hack for Boxee Remote
if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
export SDL_MOUSE_RELATIVE=0 export SDL_MOUSE_RELATIVE=0
fi fi
# hack: make addon-bins executable # hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
# starting autostart script (will be removed later again, dont use it!!!) # starting autostart script (will be removed later again, dont use it!!!)
AUTOSTART="/storage/.config/autostart.sh" AUTOSTART="/storage/.config/autostart.sh"
if [ -f $AUTOSTART ]; then if [ -f $AUTOSTART ]; then
echo "!!! AUTOSTART script detected !!!" >> /var/log/messages echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
@ -48,19 +46,19 @@ case $RUNLEVEL in
sh $AUTOSTART sh $AUTOSTART
fi fi
# starting autoupdate # starting autoupdate
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate & [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
# waiting for Xorg to start # waiting for Xorg to start
wait_for_xorg wait_for_xorg
# set cpu's to 'on demand' # set cpu's to 'on demand'
( usleep 15000000 ( usleep 15000000
progress "set cpu's to 'on demand'" progress "set cpu's to 'on demand'"
cpupower frequency-set -g ondemand > /dev/null 2>&1 cpupower frequency-set -g ondemand > /dev/null 2>&1
)& )&
# starting XBMC # starting XBMC
while true; do while true; do
DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1 DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
@ -87,8 +85,3 @@ case $RUNLEVEL in
usleep 250000 usleep 250000
done done
;;
poweroff|reboot)
;;
esac