init.sh: don't try to load the dummy camera driver

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index 3e02a24..20161d6 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -61,14 +61,14 @@ function init_hal_bluetooth()
        if [ -n "$BTUART_PORT" ]; then
                set_property hal.bluetooth.uart $BTUART_PORT
                chown bluetooth.bluetooth $BTUART_PORT
-               btattach -P bcm -B $BTUART_PORT &
+               start btattach:-B$BTUART_PORT
                log -t hciconfig -p i "`hciconfig`"
        fi
 }
 
 function init_hal_camera()
 {
-       [ -c /dev/video0 ] || modprobe vivi
+       return
 }
 
 function init_hal_gps()
@@ -402,18 +402,20 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
        case $c in
-               androidboot.hardware=*)
+               *.*=*)
                        ;;
                *=*)
                        eval $c
-                       case $c in
-                               HWACCEL=*)
-                                       set_property debug.egl.hw $HWACCEL
-                                       ;;
-                               DEBUG=*)
-                                       set_property debug.logcat 1
-                                       ;;
-                       esac
+                       if [ -z "$1" ]; then
+                               case $c in
+                                       HWACCEL=*)
+                                               set_property debug.egl.hw $HWACCEL
+                                               ;;
+                                       DEBUG=*)
+                                               [ -n "$DEBUG" ] && set_property debug.logcat 1
+                                               ;;
+                               esac
+                       fi
                        ;;
        esac
 done