diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 194: Avoid boot_linaro_image failure due to a new test image shell prompt

Message ID 20120118000718.8026.20425.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson Jan. 18, 2012, 12:07 a.m. UTC 
Merge authors:
  Spring Zhang (qzhang)
Related merge proposals:
  https://code.launchpad.net/~qzhang/lava-dispatcher/fix-917221/+merge/88724
  proposed by: Spring Zhang (qzhang)
  review: Approve - Paul Larson (pwlars)
------------------------------------------------------------
revno: 194 [merge]
committer: Paul Larson <paul.larson@linaro.org>
branch nick: lava-dispatcher
timestamp: Tue 2012-01-17 18:04:46 -0600
message:
  Avoid boot_linaro_image failure due to a new test image shell prompt
modified:
  lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== 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 15:57:23 +0000
@@ -74,10 +74,10 @@ 
 sdcard_part_android = 6
 
 # Master image recognization string
-MASTER_STR = root@master:
+MASTER_STR = root@master
 
 # Test image recognization string
-TESTER_STR = root@linaro:
+TESTER_STR = root@linaro
 
 # The character the boot loader uses as a prompt on this board.
 bootloader_prompt = #
@@ -88,4 +88,4 @@ 
 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