Merge lp:~le-chi-thu/lava-dispatcher/snowball_android_fix into lp:lava-dispatcher

[Le Chi Thu]

I forgot add new keys to default device file.

[Zygmunt Krynicki (zyga)]

+1

Please get another review though

review: Approve

[Michael Hudson-Doyle (mwhudson)]

+1

review: Approve

[Spring Zhang (qzhang)]

17 \ No newline at end of file
Can there be a newline? Is the warning message strange in Python? If yes, add the newline.

[Yongqin Liu (liuyq0307)]

thanks.
but I still doubt whether it is necessary that the source needs to be modified to make it more flexible.

review: Approve

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-01-09 03:16:32 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf	2012-01-16 23:28:31 +0000
@@ -88,4 +88,10 @@
 lmc_dev_arg = %(device_type)s
 
 # The value to pass to qemu-system-arm's -M option.
-qemu_machine_type = %(device_type)s
 \ No newline at end of file
+qemu_machine_type = %(device_type)s
+
+# This is used for snowball soft reset fix, since the reboot command is hanging.
+soft_boot_cmd =
+
+# This is for android build where the network is not up by default. 1 or 0
+enable_network_after_boot_android = 0
 \ No newline at end of file