diff options
| author | lcapriotti <lcapriotti@svn> | 2009-11-16 16:25:57 +0000 |
|---|---|---|
| committer | lcapriotti <lcapriotti@svn> | 2009-11-16 16:25:57 +0000 |
| commit | 58812bc7c369880d91bbb4d328888eb35763bd97 (patch) | |
| tree | 05ee8372ef0391b32ce682c118f414a3bc16b393 /tools/XBMCLive | |
| parent | b48ef8cb907426e7dfe1f444f3509b77dc176666 (diff) | |
implemented support for boot hooks, cleaner boot and udev waiting
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24665 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/XBMCLive')
| -rw-r--r-- | tools/XBMCLive/xbmc-live.conf | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/tools/XBMCLive/xbmc-live.conf b/tools/XBMCLive/xbmc-live.conf index 2b86ab6f2a..e7c0b1980c 100644 --- a/tools/XBMCLive/xbmc-live.conf +++ b/tools/XBMCLive/xbmc-live.conf @@ -41,8 +41,11 @@ pre-start script # copy xorg.conf from "Config" directory if [ -n "$BOOTMEDIAMOUNTPOINT" ]; then - if [ -f $BOOTMEDIAMNTPOINT/config/xorg.conf ]; then - cp $BOOTMEDIAMNTPOINT/config/xorg.conf /etc/X11 + if [ -f $BOOTMEDIAMNTPOINT/config/hook.sh ]; then + cp $BOOTMEDIAMNTPOINT/config/hook.sh /root/hook.sh + chmod 0755 /root/hook.sh + /root/hook.sh + rm -f /root/hook.sh fi fi @@ -98,11 +101,19 @@ script fi # TODO check if needed - if [ "$(pidof usplash)" ] ; then - stop usplash +# if [ "$(pidof usplash)" ] ; then +# stop usplash +# fi + initctl emit dm-started + + # Clean up the console before we switch to it, to avoid text flicker + if [ -x /usr/bin/tput ] ; then + tput -Tlinux reset > /dev/tty8 || true fi - # chvt 7 + # Clear VT 1 & 8 of any console messages + clear >/dev/tty8 || true + chvt 8 exec /usr/bin/runXBMC end script @@ -162,6 +173,9 @@ post-start script exit fi + udevTriggerPID=$(pidof udevtrigger) + while test -d /proc/$udevTriggerPID; do sleep 1; done; + usbPort=$(findUSBPort "${lircDriver}") if [ -z "$usbPort" ]; then |